Break down PGP Activity into focused sections (#776)

2 files changed, 13 insertions, 13 deletions

diff --git a/app/src/main/res/layout/decrypt_layout.xml b/app/src/main/res/layout/decrypt_layout.xml
index 590661b3..664cb482 100644
--- a/app/src/main/res/layout/decrypt_layout.xml
+++ b/app/src/main/res/layout/decrypt_layout.xml
@@ -19,7 +19,7 @@
         android:padding="16dp">
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_category_decrypt"
+            android:id="@+id/password_category"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -32,7 +32,7 @@
             tools:text="CATEGORY HERE" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_file"
+            android:id="@+id/password_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -41,11 +41,11 @@
             android:textSize="24sp"
             android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_category_decrypt"
+            app:layout_constraintTop_toBottomOf="@id/password_category"
             tools:text="PASSWORD FILE NAME HERE" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/crypto_password_last_changed"
+            android:id="@+id/password_last_changed"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -54,7 +54,7 @@
             android:textIsSelectable="false"
             android:textSize="18sp"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_file"
+            app:layout_constraintTop_toBottomOf="@id/password_file"
             tools:text="LAST CHANGED HERE" />
 
 
@@ -65,7 +65,7 @@
             android:layout_marginTop="16dp"
             android:layout_marginBottom="16dp"
             android:src="@drawable/divider"
-            app:layout_constraintTop_toBottomOf="@id/crypto_password_last_changed"
+            app:layout_constraintTop_toBottomOf="@id/password_last_changed"
             tools:ignore="ContentDescription" />
 
         <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/password_creation_activity.xml
index 02864135..13af597c 100644
--- a/app/src/main/res/layout/encrypt_layout.xml
+++ b/app/src/main/res/layout/password_creation_activity.xml
@@ -11,10 +11,10 @@
     android:background="?android:attr/windowBackground"
     android:orientation="vertical"
     android:padding="@dimen/activity_horizontal_margin"
-    tools:context="com.zeapo.pwdstore.crypto.PgpActivity">
+    tools:context="com.zeapo.pwdstore.crypto.PasswordCreationActivity">
 
     <androidx.appcompat.widget.AppCompatEditText
-        android:id="@+id/crypto_password_category"
+        android:id="@+id/category"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/activity_horizontal_margin"
@@ -33,10 +33,10 @@
         android:layout_margin="8dp"
         android:hint="@string/crypto_name_hint"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/crypto_password_category">
+        app:layout_constraintTop_toBottomOf="@id/category">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_password_file_edit"
+            android:id="@+id/filename"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </com.google.android.material.textfield.TextInputLayout>
@@ -52,7 +52,7 @@
         app:layout_constraintTop_toBottomOf="@id/name_input_layout">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_password_edit"
+            android:id="@+id/password"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:inputType="textVisiblePassword" />
@@ -77,14 +77,14 @@
         app:layout_constraintTop_toBottomOf="@id/generate_password">
 
         <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/crypto_extra_edit"
+            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>
 
-    <Switch
+    <com.google.android.material.switchmaterial.SwitchMaterial
         android:id="@+id/encrypt_username"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"