From 7bdcb041de95c8d8d8d14f1dbd34a3380b326871 Mon Sep 17 00:00:00 2001
From: "Danilo M." <danix@danix.xyz>
Date: Tue, 3 Nov 2026 08:59:12 +0100
Subject: refactor(app): remove the legacy editor, generators and folder picker

The Compose editor, generator sheet, OTP dialog and folder picker
replace PasswordCreationActivity, the generator and manual OTP dialog
fragments, SelectFolderActivity with its fragment and adapter, their
layouts and menus, and upstream's unused EditPasswordScreen with the
PasswordField it used. flowbinding and swiperefreshlayout had no other
users. BasePGPActivity keeps what autofill decryption still needs.

Also drops two stale SshKey baseline entries, the snackbar FAB anchor
whose view is gone, and resources only the deleted files used.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 .../main/res/layout/fragment_manual_otp_entry.xml  |  53 --------
 app/src/main/res/layout/fragment_pwgen.xml         | 115 ----------------
 .../main/res/layout/fragment_pwgen_diceware.xml    |  73 ----------
 .../main/res/layout/password_creation_activity.xml | 147 ---------------------
 app/src/main/res/layout/password_recycler_view.xml |  38 ------
 app/src/main/res/layout/password_row_layout.xml    |  50 -------
 app/src/main/res/layout/select_folder_layout.xml   |  16 ---
 7 files changed, 492 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_manual_otp_entry.xml
 delete mode 100644 app/src/main/res/layout/fragment_pwgen.xml
 delete mode 100644 app/src/main/res/layout/fragment_pwgen_diceware.xml
 delete mode 100644 app/src/main/res/layout/password_creation_activity.xml
 delete mode 100644 app/src/main/res/layout/password_recycler_view.xml
 delete mode 100644 app/src/main/res/layout/password_row_layout.xml
 delete mode 100644 app/src/main/res/layout/select_folder_layout.xml

(limited to 'app/src/main/res/layout')

diff --git a/app/src/main/res/layout/fragment_manual_otp_entry.xml b/app/src/main/res/layout/fragment_manual_otp_entry.xml
deleted file mode 100644
index 7d7ea832..00000000
--- a/app/src/main/res/layout/fragment_manual_otp_entry.xml
+++ /dev/null
@@ -1,53 +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"
-  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"
-      android:inputType="textPassword" />
-
-    <requestFocus />
-
-  </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>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_pwgen.xml b/app/src/main/res/layout/fragment_pwgen.xml
deleted file mode 100644
index 02eadff5..00000000
--- a/app/src/main/res/layout/fragment_pwgen.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
-  ~ 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="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="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:labelFor="@id/lengthNumber"
-          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:autofillHints="notApplicable"
-          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_pwgen_diceware.xml b/app/src/main/res/layout/fragment_pwgen_diceware.xml
deleted file mode 100644
index b8627670..00000000
--- a/app/src/main/res/layout/fragment_pwgen_diceware.xml
+++ /dev/null
@@ -1,73 +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"
-  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">
-
-  <androidx.appcompat.widget.AppCompatTextView
-    android:id="@+id/password_text"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:textAppearance="?android:attr/textAppearanceMedium"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-
-  <com.google.android.material.textfield.TextInputLayout
-    android:id="@+id/password_length"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginEnd="4dp"
-    android:hint="@string/pwgen_length"
-    android:labelFor="@id/password_length_text"
-    app:hintAnimationEnabled="true"
-    app:hintEnabled="true"
-    app:layout_constraintEnd_toStartOf="@id/password_separator"
-    app:layout_constraintHorizontal_weight="0.5"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toBottomOf="@id/password_text">
-
-    <com.google.android.material.textfield.TextInputEditText
-      android:id="@+id/password_length_text"
-      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/password_separator"
-    android:layout_width="0dp"
-    android:layout_height="wrap_content"
-    android:layout_marginStart="4dp"
-    android:layout_marginTop="8dp"
-    android:hint="@string/pwgen_separator"
-    android:labelFor="@id/password_separator_text"
-    app:hintAnimationEnabled="true"
-    app:hintEnabled="true"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHorizontal_weight="0.5"
-    app:layout_constraintStart_toEndOf="@id/password_length"
-    app:layout_constraintTop_toBottomOf="@id/password_text">
-
-    <com.google.android.material.textfield.TextInputEditText
-      android:id="@+id/password_separator_text"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:autofillHints=""
-      android:importantForAutofill="no"
-      android:inputType="text"
-      android:maxLength="1" />
-  </com.google.android.material.textfield.TextInputLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/password_creation_activity.xml b/app/src/main/res/layout/password_creation_activity.xml
deleted file mode 100644
index c0692753..00000000
--- a/app/src/main/res/layout/password_creation_activity.xml
+++ /dev/null
@@ -1,147 +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: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="app.passwordstore.ui.crypto.PasswordCreationActivity">
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    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">
-
-      <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.TextInputEditText
-        android:id="@+id/filename"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:imeOptions="actionNext"
-        android:inputType="textNoSuggestions"
-        android:nextFocusForward="@id/username" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textfield.TextInputLayout
-      android:visibility="gone"
-      tools:visibility="visible"
-      android:id="@+id/username_input_layout"
-      android:layout_width="match_parent"
-      android:layout_height="wrap_content"
-      android:layout_margin="8dp"
-      android:hint="@string/crypto_username_hint"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/name_input_layout">
-
-      <com.google.android.material.textfield.TextInputEditText
-        android:id="@+id/username"
-        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/username_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.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.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.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>
-</ScrollView>
diff --git a/app/src/main/res/layout/password_recycler_view.xml b/app/src/main/res/layout/password_recycler_view.xml
deleted file mode 100644
index c2b5114f..00000000
--- a/app/src/main/res/layout/password_recycler_view.xml
+++ /dev/null
@@ -1,38 +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.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:clipChildren="false"
-  android:clipToPadding="false"
-  android:orientation="vertical">
-
-  <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>
-
-  <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:contentDescription="@string/password_list_fab_content_description"
-    android:src="@drawable/ic_add_48dp" />
-</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
deleted file mode 100644
index 5c042839..00000000
--- a/app/src/main/res/layout/password_row_layout.xml
+++ /dev/null
@@ -1,50 +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: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/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.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
deleted file mode 100644
index 78b03579..00000000
--- a/app/src/main/res/layout/select_folder_layout.xml
+++ /dev/null
@@ -1,16 +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">
-
-  <LinearLayout
-    android:id="@+id/pgp_handler_linearlayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" />
-</LinearLayout>
-- 
cgit v1.2.3