diff options
Diffstat (limited to 'app/src/main/res/layout')
31 files changed, 1755 insertions, 1757 deletions
diff --git a/app/src/main/res/layout/activity_git_clone.xml b/app/src/main/res/layout/activity_git_clone.xml index b07c2c60..9aac7d0d 100644 --- a/app/src/main/res/layout/activity_git_clone.xml +++ b/app/src/main/res/layout/activity_git_clone.xml @@ -4,131 +4,131 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" + 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:background="?android:attr/windowBackground" + android:padding="@dimen/activity_horizontal_margin" + tools:background="@color/white" + tools:context="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity"> + + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?android:attr/windowBackground" - android:padding="@dimen/activity_horizontal_margin" - tools:background="@color/white" - tools:context="dev.msfjarvis.aps.ui.git.config.GitServerConfigActivity"> - - <androidx.constraintlayout.widget.ConstraintLayout + android:layout_height="wrap_content"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/server_label" + style="@style/TextAppearance.MaterialComponents.Headline5" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:text="@string/server_name" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/label_server_url" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/server_url" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/server_label"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_url" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:inputType="textWebEmailAddress" + android:nextFocusForward="@id/server_branch" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/label_server_branch" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:hint="@string/server_branch" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_server_url"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/server_branch" android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/server_label" - style="@style/TextAppearance.MaterialComponents.Headline5" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:text="@string/server_name" - android:textSize="24sp" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/label_server_url" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:hint="@string/server_url" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/server_label"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/server_url" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:inputType="textWebEmailAddress" - android:nextFocusForward="@id/server_branch" /> - - </com.google.android.material.textfield.TextInputLayout> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/label_server_branch" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:hint="@string/server_branch" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/label_server_url"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/server_branch" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:inputType="textNoSuggestions" /> - - </com.google.android.material.textfield.TextInputLayout> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/label_auth_mode" - style="@style/TextAppearance.MaterialComponents.Headline6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:text="@string/connection_mode" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/label_server_branch" /> - - <com.google.android.material.chip.ChipGroup - android:id="@+id/auth_mode_group" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="8dp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/label_auth_mode" - app:singleSelection="true"> - - <com.google.android.material.chip.Chip - android:id="@+id/auth_mode_ssh_key" - style="@style/AppTheme.Chip.Choice" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/connection_mode_ssh_key" /> - - <com.google.android.material.chip.Chip - android:id="@+id/auth_mode_password" - style="@style/AppTheme.Chip.Choice" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/connection_mode_basic_authentication" /> - - <com.google.android.material.chip.Chip - android:id="@+id/auth_mode_open_keychain" - style="@style/AppTheme.Chip.Choice" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/connection_mode_openkeychain" /> - </com.google.android.material.chip.ChipGroup> - - <com.google.android.material.button.MaterialButton - android:id="@+id/save_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/crypto_save" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/auth_mode_group" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/clear_host_key_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/clear_saved_host_key" - android:visibility="gone" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/auth_mode_group" - tools:visibility="visible" /> - </androidx.constraintlayout.widget.ConstraintLayout> + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="textNoSuggestions" /> + + </com.google.android.material.textfield.TextInputLayout> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/label_auth_mode" + style="@style/TextAppearance.MaterialComponents.Headline6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:text="@string/connection_mode" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_server_branch" /> + + <com.google.android.material.chip.ChipGroup + android:id="@+id/auth_mode_group" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/label_auth_mode" + app:singleSelection="true"> + + <com.google.android.material.chip.Chip + android:id="@+id/auth_mode_ssh_key" + style="@style/AppTheme.Chip.Choice" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/connection_mode_ssh_key" /> + + <com.google.android.material.chip.Chip + android:id="@+id/auth_mode_password" + style="@style/AppTheme.Chip.Choice" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/connection_mode_basic_authentication" /> + + <com.google.android.material.chip.Chip + android:id="@+id/auth_mode_open_keychain" + style="@style/AppTheme.Chip.Choice" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/connection_mode_openkeychain" /> + </com.google.android.material.chip.ChipGroup> + + <com.google.android.material.button.MaterialButton + android:id="@+id/save_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/auth_mode_group" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/clear_host_key_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:text="@string/clear_saved_host_key" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/auth_mode_group" + tools:visibility="visible" /> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml index e964a31f..6f86f381 100644 --- a/app/src/main/res/layout/activity_git_config.xml +++ b/app/src/main/res/layout/activity_git_config.xml @@ -4,102 +4,102 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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:padding="@dimen/activity_horizontal_margin" - tools:context="dev.msfjarvis.aps.ui.git.config.GitConfigActivity" - tools:layout_editor_absoluteX="0dp" - tools:layout_editor_absoluteY="81dp"> + 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:padding="@dimen/activity_horizontal_margin" + tools:context="dev.msfjarvis.aps.ui.git.config.GitConfigActivity" + tools:layout_editor_absoluteX="0dp" + tools:layout_editor_absoluteY="81dp"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/username_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:hint="@string/git_user_name_hint" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:layout_editor_absoluteY="64dp"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/username_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:hint="@string/git_user_name_hint" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:layout_editor_absoluteY="64dp"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/git_user_name" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPersonName" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/git_user_name" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPersonName" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/email_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:hint="@string/git_user_email" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/username_input_layout"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/email_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:hint="@string/git_user_email" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/username_input_layout"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/git_user_email" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textEmailAddress" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/git_user_email" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textEmailAddress" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.button.MaterialButton - android:id="@+id/save_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:text="@string/crypto_save" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/email_input_layout" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/save_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/email_input_layout" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/git_tools_title" - style="@style/TextAppearance.MaterialComponents.Headline5" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:text="@string/git_tools" - android:textSize="24sp" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/save_button" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/git_tools_title" + style="@style/TextAppearance.MaterialComponents.Headline5" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:text="@string/git_tools" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/save_button" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/git_head_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/git_tools_title" - tools:text="HEAD status" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/git_head_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/git_tools_title" + tools:text="HEAD status" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/git_log" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:text="@string/git_log" - app:layout_constraintTop_toBottomOf="@+id/git_head_status" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/git_log" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:text="@string/git_log" + app:layout_constraintTop_toBottomOf="@+id/git_head_status" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/git_abort_rebase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:text="@string/abort_rebase" - app:layout_constraintTop_toBottomOf="@+id/git_log" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/git_abort_rebase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:text="@string/abort_rebase" + app:layout_constraintTop_toBottomOf="@+id/git_log" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/git_reset_to_remote" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="@dimen/normal_margin" - android:text="@string/reset_to_remote" - app:layout_constraintTop_toBottomOf="@id/git_abort_rebase" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/git_reset_to_remote" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="@dimen/normal_margin" + android:text="@string/reset_to_remote" + app:layout_constraintTop_toBottomOf="@id/git_abort_rebase" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_git_log.xml b/app/src/main/res/layout/activity_git_log.xml index 3ef78784..33d9a761 100644 --- a/app/src/main/res/layout/activity_git_log.xml +++ b/app/src/main/res/layout/activity_git_log.xml @@ -4,19 +4,19 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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"> + 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"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/git_log_recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:scrollbars="vertical" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - tools:context=".ui.git.log.GitLogActivity" - tools:listitem="@layout/git_log_row_layout" /> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/git_log_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:scrollbars="vertical" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + tools:context=".ui.git.log.GitLogActivity" + tools:listitem="@layout/git_log_row_layout" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_onboarding.xml b/app/src/main/res/layout/activity_onboarding.xml index 4ecd7170..7505f072 100644 --- a/app/src/main/res/layout/activity_onboarding.xml +++ b/app/src/main/res/layout/activity_onboarding.xml @@ -4,15 +4,15 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary" + android:orientation="vertical"> + + <androidx.fragment.app.FragmentContainerView + android:id="@+id/fragment_first_run" + android:name="dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorPrimary" - android:orientation="vertical"> - - <androidx.fragment.app.FragmentContainerView - android:id="@+id/fragment_first_run" - android:name="dev.msfjarvis.aps.ui.onboarding.fragments.WelcomeFragment" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:tag="welcome_fragment" /> + android:tag="welcome_fragment" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_oreo_autofill_filter.xml b/app/src/main/res/layout/activity_oreo_autofill_filter.xml index b6257805..7903425c 100644 --- a/app/src/main/res/layout/activity_oreo_autofill_filter.xml +++ b/app/src/main/res/layout/activity_oreo_autofill_filter.xml @@ -4,129 +4,129 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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:elevation="2dp" - tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView"> + 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:elevation="2dp" + tools:context="dev.msfjarvis.aps.ui.autofill.AutofillFilterView"> - <ImageView - android:id="@+id/cover" - android:layout_width="0dp" - android:layout_height="60dp" - android:background="@color/primary_color" - android:contentDescription="@string/app_name" - android:src="@mipmap/ic_launcher_foreground" - app:layout_constraintBottom_toTopOf="@id/origin" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.0" /> + <ImageView + android:id="@+id/cover" + android:layout_width="0dp" + android:layout_height="60dp" + android:background="@color/primary_color" + android:contentDescription="@string/app_name" + android:src="@mipmap/ic_launcher_foreground" + app:layout_constraintBottom_toTopOf="@id/origin" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintVertical_bias="0.0" /> - <TextView - android:id="@+id/origin" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:singleLine="false" - android:textAlignment="center" - app:layout_constraintBottom_toTopOf="@id/searchLayout" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/cover" - app:layout_constraintVertical_bias="0.0" /> + <TextView + android:id="@+id/origin" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="false" + android:textAlignment="center" + app:layout_constraintBottom_toTopOf="@id/searchLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/cover" + app:layout_constraintVertical_bias="0.0" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/searchLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - app:endIconMode="clear_text" - app:layout_constraintBottom_toTopOf="@id/rvPasswordSwitcher" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/origin"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/searchLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + app:endIconMode="clear_text" + app:layout_constraintBottom_toTopOf="@id/rvPasswordSwitcher" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/origin"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/search" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/action_search" - android:imeOptions="actionDone" - android:inputType="text" - tools:text="example.com" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/search" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/action_search" + android:imeOptions="actionDone" + android:inputType="text" + tools:text="example.com" /> + </com.google.android.material.textfield.TextInputLayout> - <ViewSwitcher - android:id="@+id/rvPasswordSwitcher" - android:layout_width="0dp" - android:layout_height="0dp" - android:layout_marginTop="@dimen/activity_vertical_margin" - app:layout_constraintBottom_toTopOf="@id/strictDomainSearch" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/searchLayout"> + <ViewSwitcher + android:id="@+id/rvPasswordSwitcher" + android:layout_width="0dp" + android:layout_height="0dp" + android:layout_marginTop="@dimen/activity_vertical_margin" + app:layout_constraintBottom_toTopOf="@id/strictDomainSearch" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/searchLayout"> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/rvPassword" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="vertical" - tools:itemCount="5" - tools:listitem="@layout/password_row_layout" /> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/rvPassword" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scrollbars="vertical" + tools:itemCount="5" + tools:listitem="@layout/password_row_layout" /> - <TextView - android:id="@+id/rvPasswordEmpty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:text="@string/oreo_autofill_filter_no_results" - android:textSize="18sp" /> + <TextView + android:id="@+id/rvPasswordEmpty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:text="@string/oreo_autofill_filter_no_results" + android:textSize="18sp" /> - </ViewSwitcher> + </ViewSwitcher> - <com.google.android.material.switchmaterial.SwitchMaterial - android:id="@+id/strictDomainSearch" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/oreo_autofill_strict_domain_search" - app:layout_constraintBottom_toTopOf="@id/shouldMatch" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/rvPasswordSwitcher" - app:layout_constraintVertical_bias="1.0" - tools:text="Phishing-resistant search" /> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/strictDomainSearch" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/oreo_autofill_strict_domain_search" + app:layout_constraintBottom_toTopOf="@id/shouldMatch" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/rvPasswordSwitcher" + app:layout_constraintVertical_bias="1.0" + tools:text="Phishing-resistant search" /> - <com.google.android.material.switchmaterial.SwitchMaterial - android:id="@+id/shouldMatch" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:checked="true" - app:layout_constraintBottom_toTopOf="@id/shouldClear" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/strictDomainSearch" - app:layout_constraintVertical_bias="1.0" - tools:text="Match with example.org" /> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/shouldMatch" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:checked="true" + app:layout_constraintBottom_toTopOf="@id/shouldClear" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/strictDomainSearch" + app:layout_constraintVertical_bias="1.0" + tools:text="Match with example.org" /> - <com.google.android.material.switchmaterial.SwitchMaterial - android:id="@+id/shouldClear" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/oreo_autofill_matches_clear_existing" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/shouldMatch" - app:layout_constraintVertical_bias="1.0" /> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/shouldClear" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/oreo_autofill_matches_clear_existing" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/shouldMatch" + app:layout_constraintVertical_bias="1.0" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml index 9f67c85a..685799eb 100644 --- a/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml +++ b/app/src/main/res/layout/activity_oreo_autofill_publisher_changed.xml @@ -4,172 +4,172 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="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:animateLayoutChanges="true" - android:elevation="2dp" - android:paddingBottom="16dp" - android:scrollbars="vertical" - tools:context="dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity"> + xmlns:app="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:animateLayoutChanges="true" + android:elevation="2dp" + android:paddingBottom="16dp" + android:scrollbars="vertical" + tools:context="dev.msfjarvis.aps.ui.autofill.AutofillPublisherChangedActivity"> - <ImageView - android:id="@+id/cover" - android:layout_width="60dp" - android:layout_height="60dp" - android:background="@color/primary_color" - android:contentDescription="@string/app_name" - android:src="@mipmap/ic_launcher_foreground" - app:layout_constraintBottom_toTopOf="@id/warningSign" - app:layout_constraintEnd_toStartOf="@id/app_name" - app:layout_constraintHorizontal_chainStyle="packed" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <ImageView + android:id="@+id/cover" + android:layout_width="60dp" + android:layout_height="60dp" + android:background="@color/primary_color" + android:contentDescription="@string/app_name" + android:src="@mipmap/ic_launcher_foreground" + app:layout_constraintBottom_toTopOf="@id/warningSign" + app:layout_constraintEnd_toStartOf="@id/app_name" + app:layout_constraintHorizontal_chainStyle="packed" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <TextView - android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/app_name" - android:textSize="18sp" - android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@id/cover" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/cover" - app:layout_constraintTop_toTopOf="@id/cover" /> + <TextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/app_name" + android:textSize="18sp" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/cover" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/cover" + app:layout_constraintTop_toTopOf="@id/cover" /> - <ImageView - android:id="@+id/warningSign" - android:layout_width="40dp" - android:layout_height="40dp" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:contentDescription="@string/oreo_autofill_warning_publisher_warning_sign_description" - android:src="@drawable/ic_warning_red_24dp" - app:layout_constraintTop_toTopOf="@id/warningHeader" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintBottom_toBottomOf="@id/warningHeader" /> + <ImageView + android:id="@+id/warningSign" + android:layout_width="40dp" + android:layout_height="40dp" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:contentDescription="@string/oreo_autofill_warning_publisher_warning_sign_description" + android:src="@drawable/ic_warning_red_24dp" + app:layout_constraintBottom_toBottomOf="@id/warningHeader" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="@id/warningHeader" /> - <TextView - android:id="@+id/warningHeader" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginStart="8dp" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/oreo_autofill_warning_publisher_header" - android:textSize="12sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/warningSign" - app:layout_constraintTop_toBottomOf="@id/cover" /> + <TextView + android:id="@+id/warningHeader" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/oreo_autofill_warning_publisher_header" + android:textSize="12sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/warningSign" + app:layout_constraintTop_toBottomOf="@id/cover" /> - <TextView - android:id="@+id/warningAppName" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:gravity="center_horizontal" - android:textSize="12sp" - app:layout_constraintBottom_toTopOf="@id/warningAppInstallDate" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/warningHeader" - tools:text="Example Banking" /> + <TextView + android:id="@+id/warningAppName" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:gravity="center_horizontal" + android:textSize="12sp" + app:layout_constraintBottom_toTopOf="@id/warningAppInstallDate" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/warningHeader" + tools:text="Example Banking" /> - <TextView - android:id="@+id/warningAppInstallDate" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:gravity="center_horizontal" - android:textSize="12sp" - app:layout_constraintBottom_toTopOf="@id/warningAppFooter" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/warningAppName" - tools:text="Installed: 5 days ago" /> + <TextView + android:id="@+id/warningAppInstallDate" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:gravity="center_horizontal" + android:textSize="12sp" + app:layout_constraintBottom_toTopOf="@id/warningAppFooter" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/warningAppName" + tools:text="Installed: 5 days ago" /> - <TextView - android:id="@+id/warningAppFooter" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/oreo_autofill_warning_publisher_footer" - android:textSize="12sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/warningAppInstallDate" /> + <TextView + android:id="@+id/warningAppFooter" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/oreo_autofill_warning_publisher_footer" + android:textSize="12sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/warningAppInstallDate" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/okButton" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:minWidth="240dp" - android:text="@string/oreo_autofill_warning_publisher_changed_disable_autofill_button" - android:textSize="12sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/warningAppFooter" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/okButton" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:minWidth="240dp" + android:text="@string/oreo_autofill_warning_publisher_changed_disable_autofill_button" + android:textSize="12sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/warningAppFooter" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/advancedButton" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:minWidth="240dp" - android:text="@string/oreo_autofill_warning_publisher_advanced_info_button" - android:textSize="12sp" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/okButton" - tools:visibility="visible" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/advancedButton" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:minWidth="240dp" + android:text="@string/oreo_autofill_warning_publisher_advanced_info_button" + android:textSize="12sp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/okButton" + tools:visibility="visible" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/resetButton" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:minWidth="240dp" - android:text="@string/oreo_autofill_warning_publisher_reenable_button" - android:textColor="?attr/colorOnSurface" - android:textSize="12sp" - android:visibility="gone" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/advancedButton" - tools:visibility="visible" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/resetButton" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:minWidth="240dp" + android:text="@string/oreo_autofill_warning_publisher_reenable_button" + android:textColor="?attr/colorOnSurface" + android:textSize="12sp" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/advancedButton" + tools:visibility="visible" /> - <TextView - android:id="@+id/warningAppAdvancedInfo" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="16dp" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:fontFamily="monospace" - android:gravity="center_horizontal" - android:textIsSelectable="true" - android:textSize="10sp" - android:visibility="gone" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/resetButton" - tools:ignore="SmallSp" - tools:text="Package: com.example.banking\n\nHash:\n8P1sW0EPJcslw7UzRsiXL64w+O50Ed+RBICtay1g24M=" - tools:visibility="visible" /> + <TextView + android:id="@+id/warningAppAdvancedInfo" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="16dp" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:fontFamily="monospace" + android:gravity="center_horizontal" + android:textIsSelectable="true" + android:textSize="10sp" + android:visibility="gone" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/resetButton" + tools:ignore="SmallSp" + tools:text="Package: com.example.banking\n\nHash:\n8P1sW0EPJcslw7UzRsiXL64w+O50Ed+RBICtay1g24M=" + tools:visibility="visible" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_preference_recyclerview.xml b/app/src/main/res/layout/activity_preference_recyclerview.xml index 2fd375ae..d973bd43 100644 --- a/app/src/main/res/layout/activity_preference_recyclerview.xml +++ b/app/src/main/res/layout/activity_preference_recyclerview.xml @@ -4,15 +4,15 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/preference_recycler_view" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/preference_recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_proxy_selector.xml b/app/src/main/res/layout/activity_proxy_selector.xml index 46753f6b..44f2637a 100644 --- a/app/src/main/res/layout/activity_proxy_selector.xml +++ b/app/src/main/res/layout/activity_proxy_selector.xml @@ -4,103 +4,103 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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"> + 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"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/proxy_host_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:hint="@string/proxy_hostname" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:layout_editor_absoluteY="64dp"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/proxy_host_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:hint="@string/proxy_hostname" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:layout_editor_absoluteY="64dp"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/proxy_host" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textUri" - android:nextFocusForward="@id/proxy_user" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/proxy_host" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textUri" + android:nextFocusForward="@id/proxy_user" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/proxy_user_input_layout" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/normal_margin" - android:layout_marginEnd="@dimen/normal_margin" - android:hint="@string/username" - app:layout_constraintEnd_toStartOf="@id/proxy_port_input_layout" - app:layout_constraintHorizontal_weight="0.65" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/proxy_host_input_layout"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/proxy_user_input_layout" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginEnd="@dimen/normal_margin" + android:hint="@string/username" + app:layout_constraintEnd_toStartOf="@id/proxy_port_input_layout" + app:layout_constraintHorizontal_weight="0.65" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/proxy_host_input_layout"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/proxy_user" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textWebEmailAddress" - android:nextFocusForward="@id/proxy_port" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/proxy_user" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textWebEmailAddress" + android:nextFocusForward="@id/proxy_port" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/proxy_port_input_layout" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/normal_margin" - android:layout_marginTop="@dimen/normal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:hint="@string/port" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_weight="0.35" - app:layout_constraintStart_toEndOf="@id/proxy_user_input_layout" - app:layout_constraintTop_toBottomOf="@id/proxy_host_input_layout"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/proxy_port_input_layout" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/normal_margin" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:hint="@string/port" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_weight="0.35" + app:layout_constraintStart_toEndOf="@id/proxy_user_input_layout" + app:layout_constraintTop_toBottomOf="@id/proxy_host_input_layout"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/proxy_port" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="number" - android:nextFocusForward="@id/proxy_password" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/proxy_port" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="number" + android:nextFocusForward="@id/proxy_password" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/proxy_password_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/normal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:hint="@string/password" - app:endIconMode="password_toggle" - app:layout_constraintStart_toStartOf="@id/proxy_user_input_layout" - app:layout_constraintTop_toBottomOf="@id/proxy_user_input_layout"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/proxy_password_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:hint="@string/password" + app:endIconMode="password_toggle" + app:layout_constraintStart_toStartOf="@id/proxy_user_input_layout" + app:layout_constraintTop_toBottomOf="@id/proxy_user_input_layout"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/proxy_password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textPassword" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/proxy_password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textPassword" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.button.MaterialButton - android:id="@+id/save" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/normal_margin" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/crypto_save" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/proxy_password_input_layout" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/save" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/normal_margin" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/crypto_save" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/proxy_password_input_layout" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/activity_pwdstore.xml b/app/src/main/res/layout/activity_pwdstore.xml index e4606ba5..5b7dd5de 100644 --- a/app/src/main/res/layout/activity_pwdstore.xml +++ b/app/src/main/res/layout/activity_pwdstore.xml @@ -4,16 +4,16 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + tools:context=".PasswordStore"> + + <LinearLayout + android:id="@+id/main_layout" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - tools:context=".PasswordStore"> - - <LinearLayout - android:id="@+id/main_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> + android:orientation="vertical" /> </LinearLayout> diff --git a/app/src/main/res/layout/activity_ssh_keygen.xml b/app/src/main/res/layout/activity_ssh_keygen.xml index 1ebcaf82..a3e822d3 100644 --- a/app/src/main/res/layout/activity_ssh_keygen.xml +++ b/app/src/main/res/layout/activity_ssh_keygen.xml @@ -4,66 +4,66 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="@dimen/activity_horizontal_margin" - android:paddingTop="@dimen/activity_vertical_margin" - android:paddingRight="@dimen/activity_horizontal_margin"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="@dimen/activity_horizontal_margin" + android:paddingTop="@dimen/activity_vertical_margin" + android:paddingRight="@dimen/activity_horizontal_margin"> - <com.google.android.material.button.MaterialButtonToggleGroup - android:id="@+id/key_type_group" - style="@style/TextAppearance.MaterialComponents.Headline1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - app:selectionRequired="true" - app:singleSelection="true"> + <com.google.android.material.button.MaterialButtonToggleGroup + android:id="@+id/key_type_group" + style="@style/TextAppearance.MaterialComponents.Headline1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + app:selectionRequired="true" + app:singleSelection="true"> - <com.google.android.material.button.MaterialButton - android:id="@+id/key_type_rsa" - style="?attr/materialButtonOutlinedStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_label_rsa" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/key_type_rsa" + style="?attr/materialButtonOutlinedStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_label_rsa" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/key_type_ecdsa" - style="?attr/materialButtonOutlinedStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_label_ecdsa" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/key_type_ecdsa" + style="?attr/materialButtonOutlinedStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_label_ecdsa" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/key_type_ed25519" - style="?attr/materialButtonOutlinedStyle" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_label_ed25519" /> - </com.google.android.material.button.MaterialButtonToggleGroup> + <com.google.android.material.button.MaterialButton + android:id="@+id/key_type_ed25519" + style="?attr/materialButtonOutlinedStyle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_label_ed25519" /> + </com.google.android.material.button.MaterialButtonToggleGroup> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/key_type_explanation" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/key_type_explanation" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingTop="8dp" /> - <com.google.android.material.checkbox.MaterialCheckBox - android:id="@+id/key_require_authentication" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/ssh_keygen_require_authentication" /> + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/key_require_authentication" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/ssh_keygen_require_authentication" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/generate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end" - android:layout_marginTop="8dp" - android:text="@string/ssh_keygen_generate" /> - </LinearLayout> + <com.google.android.material.button.MaterialButton + android:id="@+id/generate" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end" + android:layout_marginTop="8dp" + android:text="@string/ssh_keygen_generate" /> + </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/basic_bottom_sheet.xml b/app/src/main/res/layout/basic_bottom_sheet.xml index bc206fde..98815a43 100644 --- a/app/src/main/res/layout/basic_bottom_sheet.xml +++ b/app/src/main/res/layout/basic_bottom_sheet.xml @@ -4,59 +4,59 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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:paddingBottom="24dp"> + 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:paddingBottom="24dp"> - <com.google.android.material.textview.MaterialTextView - android:id="@+id/bottom_sheet_title" - style="@style/TextAppearance.MaterialComponents.Headline6" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="8dp" - android:visibility="gone" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="Bottom sheet title" /> + <com.google.android.material.textview.MaterialTextView + android:id="@+id/bottom_sheet_title" + style="@style/TextAppearance.MaterialComponents.Headline6" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="8dp" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="Bottom sheet title" /> - <com.google.android.material.textview.MaterialTextView - android:id="@+id/bottom_sheet_message" - style="@style/TextAppearance.MaterialComponents.Body1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:layout_marginTop="16dp" - android:layout_marginEnd="8dp" - app:layout_constraintTop_toBottomOf="@id/bottom_sheet_title" - tools:text="A long body of text that serves as the bottom sheet message" /> + <com.google.android.material.textview.MaterialTextView + android:id="@+id/bottom_sheet_message" + style="@style/TextAppearance.MaterialComponents.Body1" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:layout_marginTop="16dp" + android:layout_marginEnd="8dp" + app:layout_constraintTop_toBottomOf="@id/bottom_sheet_title" + tools:text="A long body of text that serves as the bottom sheet message" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/bottom_sheet_cancel_button" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:layout_marginEnd="8dp" - android:text="@string/dialog_cancel" - android:visibility="gone" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message" - tools:visibility="visible" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/bottom_sheet_cancel_button" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:layout_marginEnd="8dp" + android:text="@string/dialog_cancel" + android:visibility="gone" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message" + tools:visibility="visible" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/bottom_sheet_ok_button" - style="@style/AppTheme.OutlinedButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:layout_marginEnd="8dp" - android:text="@string/dialog_ok" - android:visibility="gone" - app:layout_constraintEnd_toStartOf="@id/bottom_sheet_cancel_button" - app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message" - tools:visibility="visible" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/bottom_sheet_ok_button" + style="@style/AppTheme.OutlinedButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:layout_marginEnd="8dp" + android:text="@string/dialog_ok" + android:visibility="gone" + app:layout_constraintEnd_toStartOf="@id/bottom_sheet_cancel_button" + app:layout_constraintTop_toBottomOf="@id/bottom_sheet_message" + tools:visibility="visible" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml index 4f8810a3..63ec9536 100644 --- a/app/src/main/res/layout/decrypt_layout.xml +++ b/app/src/main/res/layout/decrypt_layout.xml @@ -4,72 +4,72 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="16dp" - tools:context=".ui.crypto.DecryptActivity"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="16dp" + tools:context=".ui.crypto.DecryptActivity"> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/password_category" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - 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" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/password_category" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dp" + 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" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/password_file" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" - android:textColor="?attr/colorSecondary" - android:textSize="24sp" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/password_category" - tools:text="PASSWORD FILE NAME HERE" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/password_file" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:textAppearance="@android:style/TextAppearance.DeviceDefault.Medium" + android:textColor="?attr/colorSecondary" + android:textSize="24sp" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_category" + tools:text="PASSWORD FILE NAME HERE" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/password_last_changed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginStart="16dp" - android:textColor="?android:attr/textColor" - android:textIsSelectable="false" - android:textSize="18sp" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/password_file" - tools:text="LAST CHANGED HERE" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/password_last_changed" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="16dp" + android:textColor="?android:attr/textColor" + android:textIsSelectable="false" + android:textSize="18sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_file" + tools:text="LAST CHANGED HERE" /> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:src="@drawable/divider" - app:layout_constraintTop_toBottomOf="@id/password_last_changed" - tools:ignore="ContentDescription" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:src="@drawable/divider" + app:layout_constraintTop_toBottomOf="@id/password_last_changed" + tools:ignore="ContentDescription" /> - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/recycler_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" - app:layout_constraintTop_toBottomOf="@id/divider" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintEnd_toEndOf="parent" - tools:listitem="@layout/item_field" /> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/recycler_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/divider" + tools:listitem="@layout/item_field" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/folder_dialog_fragment.xml b/app/src/main/res/layout/folder_dialog_fragment.xml index 1ad1ce70..28a8287f 100644 --- a/app/src/main/res/layout/folder_dialog_fragment.xml +++ b/app/src/main/res/layout/folder_dialog_fragment.xml @@ -4,34 +4,34 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:padding="16dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical" + android:padding="16dp"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/folder_name_container" - style="@style/AppTheme.TextInputLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/crypto_name_hint" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/folder_name_container" + style="@style/AppTheme.TextInputLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/crypto_name_hint" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/folder_name_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textNoSuggestions|textVisiblePassword" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/folder_name_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textNoSuggestions|textVisiblePassword" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.checkbox.MaterialCheckBox - android:id="@+id/set_gpg_key" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:text="@string/new_folder_set_gpg_key" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/folder_name_container" /> + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/set_gpg_key" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:text="@string/new_folder_set_gpg_key" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/folder_name_container" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_clone.xml b/app/src/main/res/layout/fragment_clone.xml index fce8316f..305f28a7 100644 --- a/app/src/main/res/layout/fragment_clone.xml +++ b/app/src/main/res/layout/fragment_clone.xml @@ -4,96 +4,96 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/colorPrimary"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/app_icon" - android:layout_width="64dp" - android:layout_height="64dp" - android:layout_marginStart="32dp" - android:layout_marginTop="@dimen/onboarding_icon_margin_top" - android:contentDescription="@string/app_icon_hint" - android:src="@mipmap/ic_launcher" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/app_icon" + android:layout_width="64dp" + android:layout_height="64dp" + android:layout_marginStart="32dp" + android:layout_marginTop="@dimen/onboarding_icon_margin_top" + android:contentDescription="@string/app_icon_hint" + android:src="@mipmap/ic_launcher" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/app_name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginStart="@dimen/fab_compat_margin" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@id/app_icon" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/app_icon" - app:layout_constraintTop_toTopOf="@+id/app_icon" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/app_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginStart="@dimen/fab_compat_margin" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/app_icon" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/app_icon" + app:layout_constraintTop_toTopOf="@+id/app_icon" /> - <TextView - android:id="@+id/repo_type" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="48dp" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/select_n_repository_type" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintStart_toStartOf="@id/app_icon" - app:layout_constraintTop_toBottomOf="@id/app_icon" /> + <TextView + android:id="@+id/repo_type" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="48dp" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/select_n_repository_type" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintStart_toStartOf="@id/app_icon" + app:layout_constraintTop_toBottomOf="@id/app_icon" /> - <TextView - android:id="@+id/tv_repo_type_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/onboarding_desc_margin_top" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/select_repo_type_text" - android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" - android:textColor="@color/color_control_normal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@id/repo_type" - app:layout_constraintTop_toBottomOf="@id/repo_type" /> + <TextView + android:id="@+id/tv_repo_type_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/onboarding_desc_margin_top" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/select_repo_type_text" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="@color/color_control_normal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/repo_type" + app:layout_constraintTop_toBottomOf="@id/repo_type" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/clone_remote" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="@dimen/onboarding_button_margin_top" - android:layout_marginEnd="16dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/clone_remote_repo" - app:layout_constraintBottom_toTopOf="@id/create_local" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_repo_type_text" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/clone_remote" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="@dimen/onboarding_button_margin_top" + android:layout_marginEnd="16dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/clone_remote_repo" + app:layout_constraintBottom_toTopOf="@id/create_local" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_repo_type_text" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/create_local" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginBottom="128dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/create_local_repo" - app:layout_constraintEnd_toEndOf="@id/clone_remote" - app:layout_constraintStart_toStartOf="@id/clone_remote" - app:layout_constraintTop_toBottomOf="@id/clone_remote" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/create_local" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="128dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/create_local_repo" + app:layout_constraintEnd_toEndOf="@id/clone_remote" + app:layout_constraintStart_toStartOf="@id/clone_remote" + app:layout_constraintTop_toBottomOf="@id/clone_remote" /> - </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/fragment_key_selection.xml b/app/src/main/res/layout/fragment_key_selection.xml index 32e16eb3..df3c531d 100644 --- a/app/src/main/res/layout/fragment_key_selection.xml +++ b/app/src/main/res/layout/fragment_key_selection.xml @@ -4,80 +4,80 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/colorPrimary" - android:orientation="vertical"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary" + android:orientation="vertical"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/app_icon" - android:layout_width="64dp" - android:layout_height="64dp" - android:layout_marginStart="32dp" - android:layout_marginTop="@dimen/onboarding_icon_margin_top" - android:contentDescription="@string/app_icon_hint" - android:src="@mipmap/ic_launcher" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/app_icon" + android:layout_width="64dp" + android:layout_height="64dp" + android:layout_marginStart="32dp" + android:layout_marginTop="@dimen/onboarding_icon_margin_top" + android:contentDescription="@string/app_icon_hint" + android:src="@mipmap/ic_launcher" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/app_name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginStart="@dimen/fab_compat_margin" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@id/app_icon" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/app_icon" - app:layout_constraintTop_toTopOf="@+id/app_icon" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/app_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginStart="@dimen/fab_compat_margin" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/app_icon" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/app_icon" + app:layout_constraintTop_toTopOf="@+id/app_icon" /> - <TextView - android:id="@+id/gpg_key" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="48dp" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/select_gpg_key_title" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0" - app:layout_constraintStart_toStartOf="@id/app_icon" - app:layout_constraintTop_toBottomOf="@id/app_icon" /> + <TextView + android:id="@+id/gpg_key" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="48dp" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/select_gpg_key_title" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0" + app:layout_constraintStart_toStartOf="@id/app_icon" + app:layout_constraintTop_toBottomOf="@id/app_icon" /> - <TextView - android:id="@+id/gpg_key_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/onboarding_desc_margin_top" - android:layout_marginEnd="16dp" - android:text="@string/select_gpg_key_message" - android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" - android:textColor="@color/color_control_normal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@id/gpg_key" - app:layout_constraintTop_toBottomOf="@id/gpg_key" /> + <TextView + android:id="@+id/gpg_key_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/onboarding_desc_margin_top" + android:layout_marginEnd="16dp" + android:text="@string/select_gpg_key_message" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="@color/color_control_normal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/gpg_key" + app:layout_constraintTop_toBottomOf="@id/gpg_key" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/select_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="48dp" - android:layout_marginEnd="16dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/gpg_key_select" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/gpg_key_text" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/select_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="48dp" + android:layout_marginEnd="16dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/gpg_key_select" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/gpg_key_text" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_manual_otp_entry.xml b/app/src/main/res/layout/fragment_manual_otp_entry.xml index 6ca8677b..d42028ac 100644 --- a/app/src/main/res/layout/fragment_manual_otp_entry.xml +++ b/app/src/main/res/layout/fragment_manual_otp_entry.xml @@ -1,51 +1,50 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. ~ SPDX-License-Identifier: GPL-3.0-only --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/secret_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/otp_import_manual_hint_secret" + android:paddingStart="16dp" + android:paddingTop="16dp" + android:paddingEnd="16dp" + app:hintEnabled="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/secret" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </com.google.android.material.textfield.TextInputLayout> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/account_layout" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/secret_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/otp_import_manual_hint_secret" - android:paddingStart="16dp" - android:paddingTop="16dp" - android:paddingEnd="16dp" - app:hintEnabled="true" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/secret" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </com.google.android.material.textfield.TextInputLayout> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/account_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/otp_import_manual_hint_account" - android:paddingStart="16dp" - android:paddingTop="16dp" - android:paddingEnd="16dp" - android:paddingBottom="16dp" - app:hintEnabled="true" - app:layout_constraintTop_toBottomOf="@id/secret_layout"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/account" - android:layout_width="match_parent" - android:layout_height="match_parent" /> - - </com.google.android.material.textfield.TextInputLayout> + android:layout_height="wrap_content" + android:hint="@string/otp_import_manual_hint_account" + android:paddingStart="16dp" + android:paddingTop="16dp" + android:paddingEnd="16dp" + android:paddingBottom="16dp" + app:hintEnabled="true" + app:layout_constraintTop_toBottomOf="@id/secret_layout"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/account" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </com.google.android.material.textfield.TextInputLayout> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml index 3646e1c6..592ef1f2 100644 --- a/app/src/main/res/layout/fragment_pwgen.xml +++ b/app/src/main/res/layout/fragment_pwgen.xml @@ -4,110 +4,110 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="24dp" + android:paddingTop="20dp" + android:paddingRight="24dp" + android:paddingBottom="20dp" + tools:context=".MainActivityFragment"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/passwordText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textIsSelectable="true" /> <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:baselineAligned="false" + android:orientation="horizontal" + android:weightSum="2"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:text="@string/pwgen_include" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <CheckBox + android:id="@+id/numerals" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_numerals" /> + + + <CheckBox + android:id="@+id/symbols" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_symbols" /> + + <CheckBox + android:id="@+id/uppercase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_uppercase" /> + + <CheckBox + android:id="@+id/lowercase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_lowercase" /> + + </LinearLayout> + + <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="20dp" - android:paddingRight="24dp" - android:paddingBottom="20dp" - tools:context=".MainActivityFragment"> + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/passwordText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textIsSelectable="true" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:baselineAligned="false" - android:orientation="horizontal" - android:weightSum="2"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="vertical"> - - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:text="@string/pwgen_include" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <CheckBox - android:id="@+id/numerals" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_numerals" /> - - - <CheckBox - android:id="@+id/symbols" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_symbols" /> - - <CheckBox - android:id="@+id/uppercase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_uppercase" /> - - <CheckBox - android:id="@+id/lowercase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_lowercase" /> - - </LinearLayout> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_weight="1" - android:orientation="vertical"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/length" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:text="@string/pwgen_length" - android:textAppearance="?android:attr/textAppearanceSmall" /> - - <EditText - android:id="@+id/lengthNumber" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="8dp" - android:ems="10" - android:inputType="number" /> - - <CheckBox - android:id="@+id/pronounceable" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_pronounceable" /> - - <CheckBox - android:id="@+id/ambiguous" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/pwgen_ambiguous" /> - - </LinearLayout> - </LinearLayout> + android:id="@+id/length" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:text="@string/pwgen_length" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + <EditText + android:id="@+id/lengthNumber" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:ems="10" + android:inputType="number" /> + + <CheckBox + android:id="@+id/pronounceable" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_pronounceable" /> + + <CheckBox + android:id="@+id/ambiguous" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/pwgen_ambiguous" /> + + </LinearLayout> </LinearLayout> + </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/fragment_repo_location.xml b/app/src/main/res/layout/fragment_repo_location.xml index dae36a63..b2adc0e6 100644 --- a/app/src/main/res/layout/fragment_repo_location.xml +++ b/app/src/main/res/layout/fragment_repo_location.xml @@ -4,96 +4,96 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/colorPrimary"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/app_icon" - android:layout_width="64dp" - android:layout_height="64dp" - android:layout_marginStart="32dp" - android:layout_marginTop="@dimen/onboarding_icon_margin_top" - android:contentDescription="@string/app_icon_hint" - android:src="@mipmap/ic_launcher" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/app_icon" + android:layout_width="64dp" + android:layout_height="64dp" + android:layout_marginStart="32dp" + android:layout_marginTop="@dimen/onboarding_icon_margin_top" + android:contentDescription="@string/app_icon_hint" + android:src="@mipmap/ic_launcher" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/app_name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginStart="@dimen/fab_compat_margin" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintBottom_toBottomOf="@id/app_icon" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toEndOf="@id/app_icon" - app:layout_constraintTop_toTopOf="@+id/app_icon" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/app_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginStart="@dimen/fab_compat_margin" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintBottom_toBottomOf="@id/app_icon" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toEndOf="@id/app_icon" + app:layout_constraintTop_toTopOf="@+id/app_icon" /> - <TextView - android:id="@+id/repo_location" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="48dp" - android:layout_marginEnd="@dimen/fab_compat_margin" - android:text="@string/repository_n_location" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@id/app_icon" - app:layout_constraintTop_toBottomOf="@id/app_icon" /> + <TextView + android:id="@+id/repo_location" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="48dp" + android:layout_marginEnd="@dimen/fab_compat_margin" + android:text="@string/repository_n_location" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline4" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/app_icon" + app:layout_constraintTop_toBottomOf="@id/app_icon" /> - <TextView - android:id="@+id/repo_location_text" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/onboarding_desc_margin_top" - android:layout_marginEnd="16dp" - android:text="@string/location_dialog_create_text" - android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" - android:textColor="@color/color_control_normal" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@id/repo_location" - app:layout_constraintTop_toBottomOf="@id/repo_location" /> + <TextView + android:id="@+id/repo_location_text" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/onboarding_desc_margin_top" + android:layout_marginEnd="16dp" + android:text="@string/location_dialog_create_text" + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle2" + android:textColor="@color/color_control_normal" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/repo_location" + app:layout_constraintTop_toBottomOf="@id/repo_location" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/hidden" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="@dimen/onboarding_button_margin_top" - android:layout_marginEnd="16dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/location_hidden" - app:layout_constraintBottom_toTopOf="@id/sdcard" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/repo_location_text" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/hidden" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="@dimen/onboarding_button_margin_top" + android:layout_marginEnd="16dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/location_hidden" + app:layout_constraintBottom_toTopOf="@id/sdcard" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/repo_location_text" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/sdcard" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginBottom="128dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/location_sdcard" - app:layout_constraintEnd_toEndOf="@id/hidden" - app:layout_constraintStart_toStartOf="@id/hidden" - app:layout_constraintTop_toBottomOf="@id/hidden" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/sdcard" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginBottom="128dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/location_sdcard" + app:layout_constraintEnd_toEndOf="@id/hidden" + app:layout_constraintStart_toStartOf="@id/hidden" + app:layout_constraintTop_toBottomOf="@id/hidden" /> - </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml index c5c59f8d..3f46c65a 100644 --- a/app/src/main/res/layout/fragment_welcome.xml +++ b/app/src/main/res/layout/fragment_welcome.xml @@ -4,65 +4,65 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="?attr/colorPrimary" - android:orientation="vertical"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="?attr/colorPrimary" + android:orientation="vertical"> - <com.google.android.material.button.MaterialButton - android:id="@+id/settings_button" - style="@style/Widget.MaterialComponents.Button.TextButton" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentEnd="true" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:text="@string/action_settings" - android:textColor="?attr/colorOnPrimary" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/settings_button" + style="@style/Widget.MaterialComponents.Button.TextButton" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_alignParentEnd="true" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:text="@string/action_settings" + android:textColor="?attr/colorOnPrimary" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/app_icon" - android:layout_width="100dp" - android:layout_height="100dp" - android:contentDescription="@string/app_icon_hint" - android:src="@mipmap/ic_launcher" - android:transitionName="transition_first_app_icon" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/app_icon" + android:layout_width="100dp" + android:layout_height="100dp" + android:contentDescription="@string/app_icon_hint" + android:src="@mipmap/ic_launcher" + android:transitionName="transition_first_app_icon" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/app_name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginTop="16dp" - android:text="@string/app_name" - android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" - android:textColor="@color/color_control_normal" - android:textStyle="bold" - android:transitionName="transition_first_run_app_name" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/app_icon" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/app_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginTop="16dp" + android:text="@string/app_name" + android:textAppearance="@style/TextAppearance.MaterialComponents.Headline5" + android:textColor="@color/color_control_normal" + android:textStyle="bold" + android:transitionName="transition_first_run_app_name" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/app_icon" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/lets_go" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="16dp" - android:layout_marginTop="48dp" - android:layout_marginEnd="16dp" - android:maxWidth="300dp" - android:minWidth="100dp" - android:text="@string/let_s_go" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/app_name" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/lets_go" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="16dp" + android:layout_marginTop="48dp" + android:layout_marginEnd="16dp" + android:maxWidth="300dp" + android:minWidth="100dp" + android:text="@string/let_s_go" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/app_name" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/fragment_xkpwgen.xml b/app/src/main/res/layout/fragment_xkpwgen.xml index 0c46ff35..47803e27 100644 --- a/app/src/main/res/layout/fragment_xkpwgen.xml +++ b/app/src/main/res/layout/fragment_xkpwgen.xml @@ -4,99 +4,99 @@ --> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - 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"> + 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"> - <androidx.constraintlayout.widget.ConstraintLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="24dp" - android:paddingTop="20dp" - android:paddingEnd="24dp" - android:paddingBottom="20dp"> + <androidx.constraintlayout.widget.ConstraintLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="24dp" + android:paddingTop="20dp" + android:paddingEnd="24dp" + android:paddingBottom="20dp"> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/xkPasswordText" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingBottom="8dp" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textIsSelectable="true" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="horisticia.tockmendprost" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/xkPasswordText" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingBottom="8dp" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textIsSelectable="true" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="horisticia.tockmendprost" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/total_words" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:hint="@string/xkpwgen_length" - android:labelFor="@id/xk_num_words" - app:layout_constraintEnd_toStartOf="@id/separator" - app:layout_constraintHorizontal_weight="0.5" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/xkPasswordText"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/total_words" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:hint="@string/xkpwgen_length" + android:labelFor="@id/xk_num_words" + app:layout_constraintEnd_toStartOf="@id/separator" + app:layout_constraintHorizontal_weight="0.5" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/xkPasswordText"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/xk_num_words" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="number" - android:maxLength="2" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/xk_num_words" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="number" + android:maxLength="2" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/separator" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:hint="@string/xkpwgen_separator" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_weight="0.5" - app:layout_constraintStart_toEndOf="@id/total_words" - app:layout_constraintTop_toTopOf="@id/total_words"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/separator" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:hint="@string/xkpwgen_separator" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_weight="0.5" + app:layout_constraintStart_toEndOf="@id/total_words" + app:layout_constraintTop_toTopOf="@id/total_words"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/xk_separator" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:autofillHints="" - android:inputType="text" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/xk_separator" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:autofillHints="" + android:inputType="text" /> + </com.google.android.material.textfield.TextInputLayout> - <Spinner - android:id="@+id/xkCapType" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:entries="@array/capitalization_type_values" - android:entryValues="@array/capitalization_type_values" - android:spinnerMode="dropdown" - app:layout_constraintEnd_toEndOf="@id/total_words" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/total_words" /> + <Spinner + android:id="@+id/xkCapType" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="16dp" + android:entries="@array/capitalization_type_values" + android:entryValues="@array/capitalization_type_values" + android:spinnerMode="dropdown" + app:layout_constraintEnd_toEndOf="@id/total_words" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/total_words" /> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/xk_numbers_symbols_label" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:hint="@string/xkpwgen_extrachars_label" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="@id/separator" - app:layout_constraintTop_toBottomOf="@id/separator" - app:layout_constraintTop_toTopOf="@id/xkCapType"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/xk_numbers_symbols_label" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:hint="@string/xkpwgen_extrachars_label" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="@id/separator" + app:layout_constraintTop_toBottomOf="@id/separator" + app:layout_constraintTop_toTopOf="@id/xkCapType"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/xk_number_symbol_mask" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:autofillHints="" - android:inputType="text" - android:text="@string/xk_numbers_symbols_append_default" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/xk_number_symbol_mask" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:autofillHints="" + android:inputType="text" + android:text="@string/xk_numbers_symbols_append_default" /> + </com.google.android.material.textfield.TextInputLayout> - </androidx.constraintlayout.widget.ConstraintLayout> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/git_credential_layout.xml b/app/src/main/res/layout/git_credential_layout.xml index 91887a3f..289d713f 100644 --- a/app/src/main/res/layout/git_credential_layout.xml +++ b/app/src/main/res/layout/git_credential_layout.xml @@ -4,36 +4,36 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="16dp"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dp"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/git_auth_passphrase_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - app:endIconMode="password_toggle" - app:errorEnabled="true" - app:hintEnabled="true" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/git_auth_passphrase_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:endIconMode="password_toggle" + app:errorEnabled="true" + app:hintEnabled="true" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/git_auth_credential" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:hint="@string/ssh_keygen_passphrase" - android:inputType="textPassword" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/git_auth_credential" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:hint="@string/ssh_keygen_passphrase" + android:inputType="textPassword" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.checkbox.MaterialCheckBox - android:id="@+id/git_auth_remember_credential" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/git_operation_remember_passphrase" - app:layout_constraintRight_toRightOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/git_auth_passphrase_layout" /> + <com.google.android.material.checkbox.MaterialCheckBox + android:id="@+id/git_auth_remember_credential" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/git_operation_remember_passphrase" + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/git_auth_passphrase_layout" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/git_log_row_layout.xml b/app/src/main/res/layout/git_log_row_layout.xml index 3d933d84..c5db4161 100644 --- a/app/src/main/res/layout/git_log_row_layout.xml +++ b/app/src/main/res/layout/git_log_row_layout.xml @@ -3,43 +3,43 @@ ~ SPDX-License-Identifier: GPL-3.0-only --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" + xmlns:app="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:paddingHorizontal="@dimen/activity_vertical_margin" + android:paddingVertical="@dimen/activity_horizontal_margin"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/git_log_row_message" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingHorizontal="@dimen/activity_vertical_margin" - android:paddingVertical="@dimen/activity_horizontal_margin"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/git_log_row_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/normal_margin" - android:ellipsize="end" - android:maxLines="2" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/git_log_row_hash" - tools:text="Commit message" /> + android:layout_marginTop="@dimen/normal_margin" + android:ellipsize="end" + android:maxLines="2" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/git_log_row_hash" + tools:text="Commit message" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/git_log_row_hash" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="?attr/colorSecondary" - android:textStyle="bold" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="Hash" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/git_log_row_hash" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="?attr/colorSecondary" + android:textStyle="bold" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="Hash" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/git_log_row_time" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:alpha="0.5" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="Time" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/git_log_row_time" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:alpha="0.5" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="Time" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/item_create_sheet.xml b/app/src/main/res/layout/item_create_sheet.xml index 43c03257..b49441ad 100644 --- a/app/src/main/res/layout/item_create_sheet.xml +++ b/app/src/main/res/layout/item_create_sheet.xml @@ -4,39 +4,39 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:app="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <com.google.android.material.button.MaterialButton - android:id="@+id/create_folder" - style="@style/Widget.MaterialComponents.Button.TextButton" - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:layout_margin="@dimen/normal_margin" - android:text="@string/bottom_sheet_create_new_folder" - android:textAlignment="viewStart" - android:textColor="?attr/colorOnSurface" - app:icon="@drawable/ic_action_new_folder" - app:iconPadding="@dimen/normal_margin" - app:iconTint="?attr/colorSecondary" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:rippleColor="?attr/colorSecondary" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/create_folder" + style="@style/Widget.MaterialComponents.Button.TextButton" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:layout_margin="@dimen/normal_margin" + android:text="@string/bottom_sheet_create_new_folder" + android:textAlignment="viewStart" + android:textColor="?attr/colorOnSurface" + app:icon="@drawable/ic_action_new_folder" + app:iconPadding="@dimen/normal_margin" + app:iconTint="?attr/colorSecondary" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:rippleColor="?attr/colorSecondary" /> - <com.google.android.material.button.MaterialButton - android:id="@+id/create_password" - style="@style/Widget.MaterialComponents.Button.TextButton" - android:layout_width="match_parent" - android:layout_height="@dimen/bottom_sheet_item_height" - android:layout_margin="@dimen/normal_margin" - android:text="@string/bottom_sheet_create_new_password" - android:textAlignment="viewStart" - android:textColor="?attr/colorOnSurface" - app:icon="@drawable/ic_action_new_password" - app:iconPadding="@dimen/normal_margin" - app:iconTint="?attr/colorSecondary" - app:layout_constraintTop_toBottomOf="@id/create_folder" - app:rippleColor="?attr/colorSecondary" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/create_password" + style="@style/Widget.MaterialComponents.Button.TextButton" + android:layout_width="match_parent" + android:layout_height="@dimen/bottom_sheet_item_height" + android:layout_margin="@dimen/normal_margin" + android:text="@string/bottom_sheet_create_new_password" + android:textAlignment="viewStart" + android:textColor="?attr/colorOnSurface" + app:icon="@drawable/ic_action_new_password" + app:iconPadding="@dimen/normal_margin" + app:iconTint="?attr/colorSecondary" + app:layout_constraintTop_toBottomOf="@id/create_folder" + app:rippleColor="?attr/colorSecondary" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/item_field.xml b/app/src/main/res/layout/item_field.xml index eba1bca2..6c74b65c 100644 --- a/app/src/main/res/layout/item_field.xml +++ b/app/src/main/res/layout/item_field.xml @@ -1,32 +1,31 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright © 2014-2021 The Android Password Store Authors. All Rights Reserved. ~ SPDX-License-Identifier: GPL-3.0-only --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/item_text_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical"> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/item_text_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - tools:visibility="visible" - tools:hint="@string/password"> + android:layout_marginTop="16dp" + tools:hint="@string/password" + tools:visibility="visible"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/item_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:editable="false" - android:fontFamily="@font/sourcecodepro" - android:textIsSelectable="true" - tools:text="p@55w0rd!" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/item_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:editable="false" + android:fontFamily="@font/sourcecodepro" + android:textIsSelectable="true" + tools:text="p@55w0rd!" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> </LinearLayout> diff --git a/app/src/main/res/layout/oreo_autofill_dataset.xml b/app/src/main/res/layout/oreo_autofill_dataset.xml index 7e73521e..92b541b7 100644 --- a/app/src/main/res/layout/oreo_autofill_dataset.xml +++ b/app/src/main/res/layout/oreo_autofill_dataset.xml @@ -4,51 +4,51 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingLeft="10dp" + android:paddingTop="5dp" + android:paddingRight="10dp" + android:paddingBottom="5dp"> + + <ImageView + android:id="@+id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - android:gravity="center_vertical" - android:paddingLeft="10dp" - android:paddingTop="5dp" - android:paddingRight="10dp" - android:paddingBottom="5dp"> - - <ImageView - android:id="@+id/icon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginEnd="10dp" - android:layout_marginTop="5dp" - android:layout_marginBottom="5dp" - android:adjustViewBounds="true" - android:maxWidth="20dp" - android:maxHeight="20dp" - android:tint="@color/secondary_color" - tools:ignore="UseAppTint" - tools:src="@mipmap/ic_launcher" /> + android:layout_gravity="center" + android:layout_marginTop="5dp" + android:layout_marginEnd="10dp" + android:layout_marginBottom="5dp" + android:adjustViewBounds="true" + android:maxWidth="20dp" + android:maxHeight="20dp" + android:tint="@color/secondary_color" + tools:ignore="UseAppTint" + tools:src="@mipmap/ic_launcher" /> - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical"> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical"> - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="middle" - android:singleLine="true" - android:textStyle="bold" - tools:text="example.org" /> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="middle" + android:singleLine="true" + android:textStyle="bold" + tools:text="example.org" /> - <TextView - android:id="@+id/summary" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:ellipsize="middle" - android:singleLine="true" - tools:text="john@doe.org" /> - </LinearLayout> + <TextView + android:id="@+id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="middle" + android:singleLine="true" + tools:text="john@doe.org" /> + </LinearLayout> </LinearLayout> diff --git a/app/src/main/res/layout/oreo_autofill_filter_row.xml b/app/src/main/res/layout/oreo_autofill_filter_row.xml index 70f27e28..9c3acfed 100644 --- a/app/src/main/res/layout/oreo_autofill_filter_row.xml +++ b/app/src/main/res/layout/oreo_autofill_filter_row.xml @@ -4,66 +4,66 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="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="@drawable/password_row_background" - android:paddingTop="8dp" - android:paddingBottom="8dp"> + xmlns:app="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="@drawable/password_row_background" + android:paddingTop="8dp" + android:paddingBottom="8dp"> - <ImageView - android:id="@+id/credentialIcon" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginStart="8dp" - android:alpha="0.5" - android:src="@drawable/ic_person_black_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/title" - app:layout_constraintHorizontal_bias="0.0" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:tint="?colorOnPrimary" /> + <ImageView + android:id="@+id/credentialIcon" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginStart="8dp" + android:alpha="0.5" + android:src="@drawable/ic_person_black_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/title" + app:layout_constraintHorizontal_bias="0.0" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:tint="?colorOnPrimary" /> - <TextView - android:id="@+id/title" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:ellipsize="middle" - android:singleLine="true" - android:textSize="12sp" - app:layout_constraintBottom_toTopOf="@id/subtitle" - app:layout_constraintEnd_toStartOf="@id/continueIcon" - app:layout_constraintStart_toEndOf="@id/credentialIcon" - app:layout_constraintTop_toTopOf="parent" - tools:text="/example.com/" /> + <TextView + android:id="@+id/title" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:ellipsize="middle" + android:singleLine="true" + android:textSize="12sp" + app:layout_constraintBottom_toTopOf="@id/subtitle" + app:layout_constraintEnd_toStartOf="@id/continueIcon" + app:layout_constraintStart_toEndOf="@id/credentialIcon" + app:layout_constraintTop_toTopOf="parent" + tools:text="/example.com/" /> - <TextView - android:id="@+id/subtitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_marginStart="8dp" - android:ellipsize="middle" - android:singleLine="true" - android:textSize="14sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@+id/continueIcon" - app:layout_constraintStart_toEndOf="@id/credentialIcon" - app:layout_constraintTop_toBottomOf="@id/title" - tools:text="johndoe@example.com" /> + <TextView + android:id="@+id/subtitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_marginStart="8dp" + android:ellipsize="middle" + android:singleLine="true" + android:textSize="14sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@+id/continueIcon" + app:layout_constraintStart_toEndOf="@id/credentialIcon" + app:layout_constraintTop_toBottomOf="@id/title" + tools:text="johndoe@example.com" /> - <ImageView - android:id="@+id/continueIcon" - android:layout_width="wrap_content" - android:layout_height="0dp" - android:layout_marginEnd="8dp" - android:src="@drawable/ic_keyboard_arrow_right_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="1.0" - app:layout_constraintStart_toEndOf="@id/title" - app:layout_constraintTop_toTopOf="parent" /> + <ImageView + android:id="@+id/continueIcon" + android:layout_width="wrap_content" + android:layout_height="0dp" + android:layout_marginEnd="8dp" + android:src="@drawable/ic_keyboard_arrow_right_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="1.0" + app:layout_constraintStart_toEndOf="@id/title" + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/oreo_autofill_instructions.xml b/app/src/main/res/layout/oreo_autofill_instructions.xml index 96e7f36c..a01190c2 100644 --- a/app/src/main/res/layout/oreo_autofill_instructions.xml +++ b/app/src/main/res/layout/oreo_autofill_instructions.xml @@ -4,48 +4,48 @@ --> <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"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingLeft="24dp" - android:paddingTop="20dp" - android:paddingRight="24dp" - android:paddingBottom="20dp"> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/intro_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/oreo_autofill_enable_dialog_description" - android:textSize="16sp" /> - - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:text="@string/oreo_autofill_enable_dialog_instructions" - android:textSize="16sp" /> - - <androidx.appcompat.widget.AppCompatTextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:text="@string/oreo_autofill_enable_dialog_installed_browsers" - android:textSize="16sp" - android:textStyle="bold" /> - - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/supportedBrowsers" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textSize="16sp" - tools:text="Firefox: Fill and save credentials" /> - - - </LinearLayout> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingLeft="24dp" + android:paddingTop="20dp" + android:paddingRight="24dp" + android:paddingBottom="20dp"> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/intro_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/oreo_autofill_enable_dialog_description" + android:textSize="16sp" /> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:text="@string/oreo_autofill_enable_dialog_instructions" + android:textSize="16sp" /> + + <androidx.appcompat.widget.AppCompatTextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:text="@string/oreo_autofill_enable_dialog_installed_browsers" + android:textSize="16sp" + android:textStyle="bold" /> + + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/supportedBrowsers" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textSize="16sp" + tools:text="Firefox: Fill and save credentials" /> + + + </LinearLayout> </ScrollView> diff --git a/app/src/main/res/layout/password_creation_activity.xml b/app/src/main/res/layout/password_creation_activity.xml index 337a6fb3..6bae6d35 100644 --- a/app/src/main/res/layout/password_creation_activity.xml +++ b/app/src/main/res/layout/password_creation_activity.xml @@ -5,123 +5,123 @@ <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" + 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:fillViewport="false" + tools:context=".ui.crypto.PasswordCreationActivity"> + + <androidx.constraintlayout.widget.ConstraintLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:fillViewport="false" - tools:context=".ui.crypto.PasswordCreationActivity"> + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="@dimen/activity_horizontal_margin"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/directory_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="8dp" + android:enabled="false" + android:hint="@string/directory_hint" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent"> - <androidx.constraintlayout.widget.ConstraintLayout + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/directory" android:layout_width="match_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="@dimen/activity_horizontal_margin"> - - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/directory_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="8dp" - android:enabled="false" - android:hint="@string/directory_hint" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent"> + android:imeOptions="actionNext" + android:inputType="textNoSuggestions" + android:nextFocusForward="@id/password" + tools:text="CATEGORY HERE" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/directory" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:inputType="textNoSuggestions" - android:nextFocusForward="@id/password" - tools:text="CATEGORY HERE" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/name_input_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_margin="8dp" + android:hint="@string/crypto_name_hint" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/directory_input_layout"> - <com.google.android.material.textfield.TextInputLayout - android:id="@+id/name_input_layout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_margin="8dp" - android:hint="@string/crypto_name_hint" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/directory_input_layout"> - - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/filename" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionNext" - android:inputType="textNoSuggestions" - android:nextFocusForward="@id/password" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/filename" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionNext" + android:inputType="textNoSuggestions" + android:nextFocusForward="@id/password" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.textfield.TextInputLayout - 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:endIconMode="password_toggle" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/name_input_layout"> + <com.google.android.material.textfield.TextInputLayout + 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:endIconMode="password_toggle" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/name_input_layout"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/password" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:inputType="textVisiblePassword" /> - </com.google.android.material.textfield.TextInputLayout> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/password" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="textVisiblePassword" /> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.button.MaterialButton - 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" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/password_input_layout" /> + <com.google.android.material.button.MaterialButton + 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" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/password_input_layout" /> - <com.google.android.material.textfield.TextInputLayout - 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:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/generate_password"> + <com.google.android.material.textfield.TextInputLayout + 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:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/generate_password"> - <com.google.android.material.textfield.TextInputEditText - android:id="@+id/extra_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:inputType="textMultiLine|textVisiblePassword" /> + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/extra_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:inputType="textMultiLine|textVisiblePassword" /> - </com.google.android.material.textfield.TextInputLayout> + </com.google.android.material.textfield.TextInputLayout> - <com.google.android.material.button.MaterialButton - android:id="@+id/otp_import_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:text="@string/add_otp" - app:icon="@drawable/ic_qr_code_scanner" - app:iconTint="?attr/colorOnSecondary" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toBottomOf="@id/extra_input_layout" /> + <com.google.android.material.button.MaterialButton + android:id="@+id/otp_import_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:text="@string/add_otp" + app:icon="@drawable/ic_qr_code_scanner" + app:iconTint="?attr/colorOnSecondary" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/extra_input_layout" /> - <com.google.android.material.switchmaterial.SwitchMaterial - android:id="@+id/encrypt_username" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:text="@string/crypto_encrypt_username_label" - android:visibility="gone" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/otp_import_button" - tools:visibility="visible" /> - </androidx.constraintlayout.widget.ConstraintLayout> + <com.google.android.material.switchmaterial.SwitchMaterial + android:id="@+id/encrypt_username" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:text="@string/crypto_encrypt_username_label" + android:visibility="gone" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/otp_import_button" + tools:visibility="visible" /> + </androidx.constraintlayout.widget.ConstraintLayout> </ScrollView> diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml index 8bd9708e..53b30d23 100644 --- a/app/src/main/res/layout/password_recycler_view.xml +++ b/app/src/main/res/layout/password_recycler_view.xml @@ -4,38 +4,38 @@ --> <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - 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:clipChildren="false" - android:clipToPadding="false" - android:orientation="vertical" - tools:context="dev.msfjarvis.aps.ui.passwords.PasswordFragment"> + 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:clipChildren="false" + android:clipToPadding="false" + android:orientation="vertical" + tools:context="dev.msfjarvis.aps.ui.passwords.PasswordFragment"> - <androidx.swiperefreshlayout.widget.SwipeRefreshLayout - android:id="@+id/swipe_refresher" - android:layout_width="match_parent" - android:layout_height="match_parent"> + <androidx.swiperefreshlayout.widget.SwipeRefreshLayout + android:id="@+id/swipe_refresher" + android:layout_width="match_parent" + android:layout_height="match_parent"> - <me.zhanghai.android.fastscroll.FixOnItemTouchListenerRecyclerView - android:id="@+id/pass_recycler" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scrollbars="none" - tools:itemCount="20" - tools:listitem="@layout/password_row_layout" /> - </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> + <me.zhanghai.android.fastscroll.FixOnItemTouchListenerRecyclerView + android:id="@+id/pass_recycler" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:scrollbars="none" + tools:itemCount="20" + tools:listitem="@layout/password_row_layout" /> + </androidx.swiperefreshlayout.widget.SwipeRefreshLayout> - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentBottom="true" - android:layout_gravity="bottom|end" - android:layout_margin="@dimen/fab_compat_margin" - android:src="@drawable/ic_add_48dp" - app:backgroundTint="?attr/colorSecondary" - app:rippleColor="?attr/colorSecondary" /> + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_alignParentBottom="true" + android:layout_gravity="bottom|end" + android:layout_margin="@dimen/fab_compat_margin" + android:src="@drawable/ic_add_48dp" + app:backgroundTint="?attr/colorSecondary" + app:rippleColor="?attr/colorSecondary" /> </androidx.coordinatorlayout.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/password_row_layout.xml b/app/src/main/res/layout/password_row_layout.xml index 0e6e6974..55295d46 100644 --- a/app/src/main/res/layout/password_row_layout.xml +++ b/app/src/main/res/layout/password_row_layout.xml @@ -4,47 +4,47 @@ --> <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="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="@drawable/password_row_background" - android:paddingTop="12dp" - android:paddingBottom="12dp"> + xmlns:app="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="@drawable/password_row_background" + android:paddingTop="12dp" + android:paddingBottom="12dp"> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/label" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_gravity="bottom" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:textSize="18sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/child_count" - app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - tools:text="FILE_NAME" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/label" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:layout_marginStart="@dimen/activity_horizontal_margin" + android:textSize="18sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/child_count" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + tools:text="FILE_NAME" /> - <androidx.appcompat.widget.AppCompatTextView - android:id="@+id/child_count" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="8dp" - android:textSize="18sp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toStartOf="@id/folder_indicator" - app:layout_constraintTop_toTopOf="parent" - tools:text="12" /> + <androidx.appcompat.widget.AppCompatTextView + android:id="@+id/child_count" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="8dp" + android:textSize="18sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/folder_indicator" + app:layout_constraintTop_toTopOf="parent" + tools:text="12" /> - <androidx.appcompat.widget.AppCompatImageView - android:id="@+id/folder_indicator" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/activity_horizontal_margin" - android:contentDescription="@null" - android:src="@drawable/ic_keyboard_arrow_right_24dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + <androidx.appcompat.widget.AppCompatImageView + android:id="@+id/folder_indicator" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/activity_horizontal_margin" + android:contentDescription="@null" + android:src="@drawable/ic_keyboard_arrow_right_24dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/select_folder_layout.xml b/app/src/main/res/layout/select_folder_layout.xml index 174adc59..e136bac5 100644 --- a/app/src/main/res/layout/select_folder_layout.xml +++ b/app/src/main/res/layout/select_folder_layout.xml @@ -4,13 +4,13 @@ --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> + + <LinearLayout + android:id="@+id/pgp_handler_linearlayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/pgp_handler_linearlayout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" /> + android:orientation="vertical" /> </LinearLayout> |