From 65f04b71e5fb347d4b426b3744e2164ff9d5168c Mon Sep 17 00:00:00 2001
From: MOHIT GUPTA <76530270+MohitGupta121@users.noreply.github.com>
Date: Wed, 10 Nov 2021 02:01:56 +0530
Subject: [PATCH] Fix #3566: Merge profile_rename_activity.xml into single xml
 file (#3950)

* solution summary xml merged

* Revert "solution summary xml merged"

This reverts commit d3638f15157e084ee0c8eb60da1db87e67a631e5.

* conflict resolved and files changes solution_summary

* merge profile reset pin activity

* merge profile rename activity
---
 .../layout-land/profile_rename_activity.xml   | 105 ------------------
 .../res/layout/profile_rename_activity.xml    |  10 +-
 app/src/main/res/values-land/dimens.xml       |   7 ++
 app/src/main/res/values/dimens.xml            |   7 ++
 4 files changed, 19 insertions(+), 110 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/profile_rename_activity.xml

diff --git a/app/src/main/res/layout-land/profile_rename_activity.xml b/app/src/main/res/layout-land/profile_rename_activity.xml
deleted file mode 100644
index c52aa0fa77a..00000000000
--- a/app/src/main/res/layout-land/profile_rename_activity.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.settings.profile.ProfileRenameViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/white">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/profile_rename_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/profile_rename_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="?attr/colorPrimary"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/navigate_up"
-        app:navigationIcon="?attr/homeAsUpIndicator"
-        app:title="@string/profile_rename_activity_title"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      android:background="@color/generalNavigationBackground"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/profile_rename_app_bar_layout">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/general_item_background_border"
-        android:paddingBottom="56dp"
-        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="168dp"
-          android:layout_marginTop="32dp"
-          android:layout_marginEnd="168dp"
-          android:hint="@string/profile_rename_label"
-          app:errorMessage="@{viewModel.nameErrorMsg}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/profile_rename_input_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:maxLength="36"
-            android:singleLine="true"
-            android:text="@{viewModel.inputName}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <Button
-          android:id="@+id/profile_rename_save_button"
-          style="@style/StateButtonActive"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="16dp"
-          android:layout_marginEnd="168dp"
-          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}"
-          android:text="@string/profile_rename_save"
-          android:textAllCaps="true"
-          android:textColor="@{viewModel.inputName.length > 0 ? @color/white : @color/submitButtonInactiveText }"
-          android:textSize="14sp"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/profile_rename_input" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/profile_rename_activity.xml b/app/src/main/res/layout/profile_rename_activity.xml
index b1ca5468c7a..71aa6fe2f4a 100644
--- a/app/src/main/res/layout/profile_rename_activity.xml
+++ b/app/src/main/res/layout/profile_rename_activity.xml
@@ -50,7 +50,7 @@
         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
@@ -58,9 +58,9 @@
           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}"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 0b4bf6e0c27..89299969c1f 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/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>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 37db7060333..cca29d74ad9 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/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>