Fix #3566: Merge profile_rename_activity.xml into single xml file (#3950

)

* solution summary xml merged

* Revert "solution summary xml merged"

This reverts commit d3638f1.

* conflict resolved and files changes solution_summary

* merge profile reset pin activity

* merge profile rename activity

app/src/main/res/layout/profile_rename_activity.xml

@@ -50,17 +50,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@drawable/general_item_background_border"
-        android:paddingBottom="32dp"
+        android:paddingBottom="@dimen/profile_rename_activity_constraint_layout"
         app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textfield.TextInputLayout
           android:id="@+id/profile_rename_input"
           style="@style/TextInputLayout"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
-          android:layout_marginTop="28dp"
-          android:layout_marginEnd="28dp"
+          android:layout_marginStart="@dimen/profile_rename_activity_profile_rename_input_margin_start"
+          android:layout_marginTop="@dimen/profile_rename_activity_profile_rename_input_margin_top"
+          android:layout_marginEnd="@dimen/profile_rename_activity_profile_rename_input_margin_end"
           android:hint="@string/profile_rename_label"
           app:errorMessage="@{viewModel.nameErrorMsg}"
           app:layout_constraintEnd_toEndOf="parent"
@@ -84,7 +84,7 @@
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:layout_marginTop="16dp"
-          android:layout_marginEnd="28dp"
+          android:layout_marginEnd="@dimen/profile_rename_activity_profile_rename_save_button_margin_end"
           android:background="@{viewModel.inputName.length > 0 ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
           android:clickable="@{viewModel.inputName.length > 0}"
           android:enabled="@{viewModel.inputName.length > 0}"

app/src/main/res/values-land/dimens.xml

@@ -377,4 +377,11 @@
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_end">168dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_save_button_margin_end">168dp</dimen>
 
+  <!-- Profile Rename Activity -->
+  <dimen name="profile_rename_activity_constraint_layout">56dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_start">168dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_top">32dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_end">168dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_save_button_margin_end">168dp</dimen>
+
 </resources>

app/src/main/res/values/dimens.xml

@@ -577,4 +577,11 @@
   <dimen name="profile_reset_pin_activity_profile_reset_input_confirm_pin_margin_end">28dp</dimen>
   <dimen name="profile_reset_pin_activity_profile_reset_save_button_margin_end">28dp</dimen>
 
+  <!-- Profile Rename Activity -->
+  <dimen name="profile_rename_activity_constraint_layout">32dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_start">28dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_top">28dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_input_margin_end">28dp</dimen>
+  <dimen name="profile_rename_activity_profile_rename_save_button_margin_end">28dp</dimen>
+
 </resources>