aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res/layout
diff options
context:
space:
mode:
authorDanilo M. <danix@danix.xyz>2026-11-03 18:50:51 +0100
committerDanilo M. <danix@danix.xyz>2026-11-03 18:50:51 +0100
commitcebdf8dd4720388d56d9af537fe81fd927e51779 (patch)
tree27555259681fae142becbdaeb5d6183dc72ab712 /app/src/main/res/layout
parent1d8b44dd387c3b78f97e1510bb5c3c719c7d4015 (diff)
downloadHardenedPass-cebdf8dd4720388d56d9af537fe81fd927e51779.tar.gz
HardenedPass-cebdf8dd4720388d56d9af537fe81fd927e51779.zip
refactor(app): remove the legacy settings screens
The Compose settings, git config, commit log and proxy screens replace SettingsActivity with its six preference providers, GitConfigActivity with TextInputDialog, GitLogActivity with its adapter and GitLogModel, and ProxySelectorActivity, with their layouts and manifest entries. The dead OpenKeystore key ID row goes with its string, the Android 14 platform bug summary and normal_margin lose their last users, and the setup intent loses the two starts only Settings used. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r--app/src/main/res/layout/activity_git_config.xml113
-rw-r--r--app/src/main/res/layout/activity_git_log.xml22
-rw-r--r--app/src/main/res/layout/activity_preference_recyclerview.xml18
-rw-r--r--app/src/main/res/layout/activity_proxy_selector.xml106
-rw-r--r--app/src/main/res/layout/dialog_text_input.xml25
-rw-r--r--app/src/main/res/layout/git_log_row_layout.xml45
-rw-r--r--app/src/main/res/layout/oreo_autofill_instructions.xml51
7 files changed, 0 insertions, 380 deletions
diff --git a/app/src/main/res/layout/activity_git_config.xml b/app/src/main/res/layout/activity_git_config.xml
deleted file mode 100644
index b43ec6d6..00000000
--- a/app/src/main/res/layout/activity_git_config.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<!--
- ~ Copyright © 2014-2024 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:tools="http://schemas.android.com/tools"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:padding="@dimen/activity_horizontal_margin"
- tools:context="app.passwordstore.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_marginTop="8dp"
- 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.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_marginTop="8dp"
- 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.TextInputLayout>
-
- <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/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_marginTop="8dp"
- 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_marginTop="8dp"
- 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_marginTop="8dp"
- 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_marginTop="8dp"
- 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_marginTop="8dp"
- android:text="@string/reset_to_remote"
- app:layout_constraintTop_toBottomOf="@id/git_abort_rebase" />
-
- <com.google.android.material.button.MaterialButton
- android:id="@+id/git_gc"
- android:layout_marginTop="8dp"
- android:text="@string/git_run_gc_job"
- app:layout_constraintTop_toBottomOf="@id/git_reset_to_remote"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
-</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
deleted file mode 100644
index e9884db0..00000000
--- a/app/src/main/res/layout/activity_git_log.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 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: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="app.passwordstore.ui.git.log.GitLogActivity"
- tools:listitem="@layout/git_log_row_layout" />
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/activity_preference_recyclerview.xml b/app/src/main/res/layout/activity_preference_recyclerview.xml
deleted file mode 100644
index 805bc79a..00000000
--- a/app/src/main/res/layout/activity_preference_recyclerview.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 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: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"
- 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
deleted file mode 100644
index b83ca9f7..00000000
--- a/app/src/main/res/layout/activity_proxy_selector.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 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: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.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
- 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.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.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.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="?attr/materialButtonOutlinedStyle"
- 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/dialog_text_input.xml b/app/src/main/res/layout/dialog_text_input.xml
deleted file mode 100644
index c8539273..00000000
--- a/app/src/main/res/layout/dialog_text_input.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 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"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="@dimen/activity_horizontal_margin">
-
- <com.google.android.material.textfield.TextInputLayout
- android:id="@+id/text_input_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content">
-
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/edit_text"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <requestFocus />
- </com.google.android.material.textfield.TextInputLayout>
-
-</LinearLayout>
diff --git a/app/src/main/res/layout/git_log_row_layout.xml b/app/src/main/res/layout/git_log_row_layout.xml
deleted file mode 100644
index e996f6af..00000000
--- a/app/src/main/res/layout/git_log_row_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 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: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: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_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/oreo_autofill_instructions.xml b/app/src/main/res/layout/oreo_autofill_instructions.xml
deleted file mode 100644
index 66881390..00000000
--- a/app/src/main/res/layout/oreo_autofill_instructions.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- ~ Copyright © 2014-2024 The Android Password Store Authors. All Rights Reserved.
- ~ SPDX-License-Identifier: GPL-3.0-only
- -->
-
-<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>
-</ScrollView>