From 88f25ec53337dadbbf5c73db537257cc8c7484a6 Mon Sep 17 00:00:00 2001
From: aayushimathur6 <92685651+aayushimathur6@users.noreply.github.com>
Date: Tue, 8 Mar 2022 10:04:11 +0530
Subject: [PATCH] Fix #3456: Merge all adminstrator_controls_* file into
 individual xml files. (#4226)

* merged all adm controls files

* requested changes

* Update dimens.xml

* requested changes dimes

* removed Extra space from land dimes

* removed Extra line
---
 ...istrator_controls_account_actions_view.xml | 49 -------------------
 .../administrator_controls_activity.xml       | 34 -------------
 ...istrator_controls_app_information_view.xml | 49 -------------------
 .../administrator_controls_fragment.xml       | 26 ----------
 .../administrator_controls_general_view.xml   | 48 ------------------
 .../administrator_controls_profile_view.xml   | 49 -------------------
 ...istrator_controls_account_actions_view.xml | 49 -------------------
 .../administrator_controls_fragment.xml       | 26 ----------
 .../administrator_controls_general_view.xml   | 48 ------------------
 ...istrator_controls_account_actions_view.xml |  8 +--
 ...istrator_controls_app_information_view.xml |  8 +--
 .../administrator_controls_fragment.xml       |  2 +-
 .../administrator_controls_general_view.xml   | 10 ++--
 .../administrator_controls_profile_view.xml   |  8 +--
 app/src/main/res/values-land/dimens.xml       | 28 +++++++++++
 .../main/res/values-sw600dp-land/dimens.xml   |  4 --
 .../main/res/values-sw600dp-port/dimens.xml   |  4 --
 app/src/main/res/values/dimens.xml            | 28 +++++++++++
 18 files changed, 74 insertions(+), 404 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_activity.xml
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_app_information_view.xml
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_fragment.xml
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_general_view.xml
 delete mode 100644 app/src/main/res/layout-land/administrator_controls_profile_view.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
 delete mode 100644 app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml

diff --git a/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml b/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
deleted file mode 100644
index cfcd43584ae..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_account_actions_view.xml
+++ /dev/null
@@ -1,49 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/account_actions_text_view"
-      style="@style/CaptionViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="36dp"
-      android:paddingTop="28dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_account_actions_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/log_out_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
-      android:paddingStart="36dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_log_out"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/account_actions_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-land/administrator_controls_activity.xml b/app/src/main/res/layout-land/administrator_controls_activity.xml
deleted file mode 100644
index 8b816d9af71..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_activity.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<layout>
-
-  <androidx.drawerlayout.widget.DrawerLayout 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:id="@+id/administrator_controls_activity_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:orientation="vertical">
-
-      <include
-        android:id="@+id/administrator_controls_activity_toolbar"
-        layout="@layout/toolbar" />
-
-      <FrameLayout
-        android:id="@+id/administrator_controls_fragment_placeholder"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <fragment
-      android:id="@+id/administrator_controls_activity_fragment_navigation_drawer"
-      android:name="org.oppia.android.app.drawer.NavigationDrawerFragment"
-      android:layout_width="@dimen/navigation_drawer_width"
-      android:layout_height="match_parent"
-      android:layout_gravity="start"
-      app:layout="@layout/drawer_fragment"
-      tools:layout="@layout/drawer_fragment" />
-  </androidx.drawerlayout.widget.DrawerLayout>
-</layout>
diff --git a/app/src/main/res/layout-land/administrator_controls_app_information_view.xml b/app/src/main/res/layout-land/administrator_controls_app_information_view.xml
deleted file mode 100644
index b07db58d82e..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_app_information_view.xml
+++ /dev/null
@@ -1,49 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAppInformationViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/app_information_text_view"
-      style="@style/CaptionViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="36dp"
-      android:paddingTop="28dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_information_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/app_version_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/app_version_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:onClick="@{(v) -> viewModel.onAppVersionClicked()}"
-      android:paddingStart="36dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_app_version"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/app_information_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-land/administrator_controls_fragment.xml b/app/src/main/res/layout-land/administrator_controls_fragment.xml
deleted file mode 100644
index 30064fce6d8..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_fragment.xml
+++ /dev/null
@@ -1,26 +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.administratorcontrols.AdministratorControlsViewModel" />
-  </data>
-
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/administrator_controls_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/admin_controls_background_color"
-    android:clipToPadding="false"
-    android:overScrollMode="never"
-    android:paddingBottom="108dp"
-    android:scrollbars="none"
-    app:data="@{viewModel.administratorControlsLiveData}"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-</layout>
diff --git a/app/src/main/res/layout-land/administrator_controls_general_view.xml b/app/src/main/res/layout-land/administrator_controls_general_view.xml
deleted file mode 100644
index 470d0dfb44a..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_general_view.xml
+++ /dev/null
@@ -1,48 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/general_text_view"
-      style="@style/Heading5ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="36dp"
-      android:paddingTop="24dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_general_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/edit_account_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:paddingStart="36dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_account"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/general_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-land/administrator_controls_profile_view.xml b/app/src/main/res/layout-land/administrator_controls_profile_view.xml
deleted file mode 100644
index 3e703da6028..00000000000
--- a/app/src/main/res/layout-land/administrator_controls_profile_view.xml
+++ /dev/null
@@ -1,49 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsProfileViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/profile_management_text_view"
-      style="@style/CaptionViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="36dp"
-      android:paddingTop="28dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_profile_management_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/edit_profiles_text_view"
-      style="@style/Body"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:onClick="@{(v) -> viewModel.onEditProfilesClicked()}"
-      android:paddingStart="36dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="36dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_profiles"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/profile_management_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
deleted file mode 100644
index 1e32e344a59..00000000000
--- a/app/src/main/res/layout-sw600dp/administrator_controls_account_actions_view.xml
+++ /dev/null
@@ -1,49 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsAccountActionsViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/account_actions_text_view"
-      style="@style/CaptionViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
-      android:paddingTop="28dp"
-      android:paddingEnd="16dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_account_actions_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/log_out_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/log_out_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
-      android:paddingStart="16dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="16dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_log_out"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/account_actions_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml b/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
deleted file mode 100644
index 495ed63cfe6..00000000000
--- a/app/src/main/res/layout-sw600dp/administrator_controls_fragment.xml
+++ /dev/null
@@ -1,26 +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.administratorcontrols.AdministratorControlsViewModel" />
-  </data>
-
-  <androidx.recyclerview.widget.RecyclerView
-    android:id="@+id/administrator_controls_list"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/admin_controls_background_color"
-    android:clipToPadding="false"
-    android:overScrollMode="never"
-    android:paddingBottom="80dp"
-    android:scrollbars="none"
-    app:data="@{viewModel.administratorControlsLiveData}"
-    app:layout_constraintBottom_toBottomOf="parent"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent" />
-</layout>
diff --git a/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml b/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml
deleted file mode 100644
index a72ade1c8b7..00000000000
--- a/app/src/main/res/layout-sw600dp/administrator_controls_general_view.xml
+++ /dev/null
@@ -1,48 +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.administratorcontrols.administratorcontrolsitemviewmodel.AdministratorControlsGeneralViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-      android:id="@+id/general_text_view"
-      style="@style/Heading5ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="16dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_general_label"
-      android:textColor="@color/admin_controls_sub_heading_color"
-      app:layout_constraintBottom_toTopOf="@id/edit_account_text_view"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-      android:id="@+id/edit_account_text_view"
-      style="@style/Subtitle1ViewStart"
-      android:layout_width="match_parent"
-      android:background="@color/admin_controls_options_background_color"
-      android:paddingStart="16dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="16dp"
-      android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_edit_account"
-      android:textColor="@color/admin_controls_menu_options_text_color"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/general_text_view" />
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout/administrator_controls_account_actions_view.xml b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
index 1e32e344a59..7028ff55a07 100644
--- a/app/src/main/res/layout/administrator_controls_account_actions_view.xml
+++ b/app/src/main/res/layout/administrator_controls_account_actions_view.xml
@@ -18,9 +18,9 @@
       style="@style/CaptionViewStart"
       android:layout_width="match_parent"
       android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_control_account_actions_view_account_actions_text_view_padding_start"
       android:paddingTop="28dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_control_account_actions_view_account_actions_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_account_actions_label"
       android:textColor="@color/admin_controls_sub_heading_color"
@@ -35,9 +35,9 @@
       android:layout_width="match_parent"
       android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onLogOutClicked()}"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_control_account_actions_view_log_out_text_view_padding_start"
       android:paddingTop="20dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_control_account_actions_view_log_out_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_log_out"
       android:textColor="@color/admin_controls_menu_options_text_color"
diff --git a/app/src/main/res/layout/administrator_controls_app_information_view.xml b/app/src/main/res/layout/administrator_controls_app_information_view.xml
index de7bb782270..a484e53362f 100644
--- a/app/src/main/res/layout/administrator_controls_app_information_view.xml
+++ b/app/src/main/res/layout/administrator_controls_app_information_view.xml
@@ -18,9 +18,9 @@
       style="@style/CaptionViewStart"
       android:layout_width="match_parent"
       android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_controls_app_information_view_app_information_text_view_padding_start"
       android:paddingTop="28dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_controls_app_information_view_app_information_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_information_label"
       android:textColor="@color/admin_controls_sub_heading_color"
@@ -35,9 +35,9 @@
       android:layout_width="match_parent"
       android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onAppVersionClicked()}"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_controls_app_information_view_app_version_text_view_padding_start"
       android:paddingTop="20dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_controls_app_information_view_app_version_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_app_version"
       android:textColor="@color/admin_controls_menu_options_text_color"
diff --git a/app/src/main/res/layout/administrator_controls_fragment.xml b/app/src/main/res/layout/administrator_controls_fragment.xml
index 495ed63cfe6..d245426bae6 100644
--- a/app/src/main/res/layout/administrator_controls_fragment.xml
+++ b/app/src/main/res/layout/administrator_controls_fragment.xml
@@ -16,7 +16,7 @@
     android:background="@color/admin_controls_background_color"
     android:clipToPadding="false"
     android:overScrollMode="never"
-    android:paddingBottom="80dp"
+    android:paddingBottom="@dimen/administrator_controls_fragment_recycler_view_padding_bottom"
     android:scrollbars="none"
     app:data="@{viewModel.administratorControlsLiveData}"
     app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/administrator_controls_general_view.xml b/app/src/main/res/layout/administrator_controls_general_view.xml
index a72ade1c8b7..028bf076bf0 100644
--- a/app/src/main/res/layout/administrator_controls_general_view.xml
+++ b/app/src/main/res/layout/administrator_controls_general_view.xml
@@ -18,9 +18,9 @@
       style="@style/Heading5ViewStart"
       android:layout_width="match_parent"
       android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
-      android:paddingTop="20dp"
-      android:paddingEnd="16dp"
+      android:paddingStart="@dimen/administrator_controls_general_view_general_text_view_padding_start"
+      android:paddingTop="@dimen/administrator_controls_general_view_general_text_view_padding_top"
+      android:paddingEnd="@dimen/administrator_controls_general_view_general_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_general_label"
       android:textColor="@color/admin_controls_sub_heading_color"
@@ -34,9 +34,9 @@
       style="@style/Subtitle1ViewStart"
       android:layout_width="match_parent"
       android:background="@color/admin_controls_options_background_color"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_controls_general_view_edit_account_text_view_padding_start"
       android:paddingTop="20dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_controls_general_view_edit_account_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_account"
       android:textColor="@color/admin_controls_menu_options_text_color"
diff --git a/app/src/main/res/layout/administrator_controls_profile_view.xml b/app/src/main/res/layout/administrator_controls_profile_view.xml
index 7158a80c46c..82fa63c2e24 100644
--- a/app/src/main/res/layout/administrator_controls_profile_view.xml
+++ b/app/src/main/res/layout/administrator_controls_profile_view.xml
@@ -18,9 +18,9 @@
       style="@style/Heading5ViewStart"
       android:layout_width="match_parent"
       android:background="@color/admin_controls_sub_heading_background_color"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_controls_profile_view_profile_management_text_view_padding_start"
       android:paddingTop="28dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_controls_profile_view_profile_management_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_profile_management_label"
       android:textColor="@color/admin_controls_sub_heading_color"
@@ -35,9 +35,9 @@
       android:layout_width="match_parent"
       android:background="@color/admin_controls_options_background_color"
       android:onClick="@{(v) -> viewModel.onEditProfilesClicked()}"
-      android:paddingStart="16dp"
+      android:paddingStart="@dimen/administrator_controls_profile_view_edit_profiles_text_view_padding_start"
       android:paddingTop="20dp"
-      android:paddingEnd="16dp"
+      android:paddingEnd="@dimen/administrator_controls_profile_view_edit_profiles_text_view_padding_end"
       android:paddingBottom="20dp"
       android:text="@string/administrator_controls_edit_profiles"
       android:textColor="@color/admin_controls_menu_options_text_color"
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index 43194938b37..77c5ccf22ea 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -451,6 +451,34 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">36dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">0dp</dimen>
 
+  <!-- AdministratorControlAccountActionsView -->
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">36dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">36dp</dimen>
+
+  <!-- AdministratorControlsAppInformationView -->
+  <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_end">36dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_end">36dp</dimen>
+
+  <!-- AdministratorControlsFragment -->
+  <dimen name="administrator_controls_fragment_recycler_view_padding_bottom">108dp</dimen>
+
+  <!-- AdministratorControlsGeneralView -->
+  <dimen name="administrator_controls_general_view_general_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_general_view_general_text_view_padding_top">24dp</dimen>
+  <dimen name="administrator_controls_general_view_general_text_view_padding_end">36dp</dimen>
+  <dimen name="administrator_controls_general_view_edit_account_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_general_view_edit_account_text_view_padding_end">36dp</dimen>
+
+  <!-- AdministratorControlsProfileView -->
+  <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_end">36dp</dimen>
+  <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_start">36dp</dimen>
+  <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_end">36dp</dimen>
+
   <!-- OptionAudioLanguage -->
   <dimen name="option_audio_language_padding_start">36dp</dimen>
   <dimen name="option_audio_language_padding_end">36dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index 1a78c246772..1837b12caf4 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -442,8 +442,4 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
-
-  <!-- OptionAudioLanguage -->
-  <dimen name="option_audio_language_padding_start">16dp</dimen>
-  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 24407053e72..fd529da1e94 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -441,8 +441,4 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
-
-  <!-- OptionAudioLanguage -->
-  <dimen name="option_audio_language_padding_start">16dp</dimen>
-  <dimen name="option_audio_language_padding_end">16dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 1d01eab4da0..0021c2c3fac 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -652,6 +652,34 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
 
+  <!-- AdministratorControlAccountActionsView -->
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_account_actions_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_control_account_actions_view_log_out_text_view_padding_end">16dp</dimen>
+
+  <!-- AdministratorControlsAppInformationView -->
+  <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_information_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_app_information_view_app_version_text_view_padding_end">16dp</dimen>
+
+  <!-- AdministratorControlsFragment -->
+  <dimen name="administrator_controls_fragment_recycler_view_padding_bottom">80dp</dimen>
+
+  <!-- AdministratorControlsGeneralView -->
+  <dimen name="administrator_controls_general_view_general_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_general_view_general_text_view_padding_top">20dp</dimen>
+  <dimen name="administrator_controls_general_view_general_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_controls_general_view_edit_account_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_general_view_edit_account_text_view_padding_end">16dp</dimen>
+
+  <!-- AdministratorControlsProfileView -->
+  <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_profile_view_profile_management_text_view_padding_end">16dp</dimen>
+  <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_start">16dp</dimen>
+  <dimen name="administrator_controls_profile_view_edit_profiles_text_view_padding_end">16dp</dimen>
+
   <!-- OptionAudioLanguage -->
   <dimen name="option_audio_language_padding_start">16dp</dimen>
   <dimen name="option_audio_language_padding_end">16dp</dimen>