Fix 1st review changes

app/src/main/AndroidManifest.xml

@@ -140,7 +140,7 @@
     <activity android:name=".app.player.state.testing.StateFragmentTestActivity" />
     <activity
       android:name=".app.profile.AddProfileActivity"
-      android:label="@string/add_profile_activity_text"
+      android:label="@string/add_profile_activity_title"
       android:theme="@style/OppiaThemeWithoutActionBarColorAccentColorPrimary" />
     <activity
       android:name=".app.profile.AdminAuthActivity"

app/src/main/java/org/oppia/android/app/profile/AddProfileActivityPresenter.kt

@@ -80,7 +80,7 @@ class AddProfileActivityPresenter @Inject constructor(
     val toolbar = activity.findViewById<View>(R.id.add_profile_activity_toolbar) as Toolbar
     activity.setSupportActionBar(toolbar)
     activity.supportActionBar?.title = resourceHandler.getStringInLocale(
-      R.string.add_profile_activity_text
+      R.string.add_profile_activity_title
     )
     activity.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     activity.supportActionBar?.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp)

app/src/main/java/org/oppia/android/app/profile/AdminAuthActivityPresenter.kt

@@ -112,17 +112,17 @@ class AdminAuthActivityPresenter @Inject constructor(
         binding?.adminAuthHeadingTextview?.text =
           resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text)
         binding?.adminAuthSubText?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_activity_controls_subject_text)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_controls_subheading_text)
       }
       AdminAuthEnum.PROFILE_ADD_PROFILE.value -> {
         activity.title =
           resourceHandler.getStringInLocale(R.string.admin_auth_activity_add_profiles_title)
         binding?.adminAuthToolbar?.title =
-          resourceHandler.getStringInLocale(R.string.add_profile_activity_text)
+          resourceHandler.getStringInLocale(R.string.add_profile_activity_title)
         binding?.adminAuthHeadingTextview?.text =
           resourceHandler.getStringInLocale(R.string.admin_auth_activity_heading_text)
         binding?.adminAuthSubText?.text =
-          resourceHandler.getStringInLocale(R.string.admin_auth_activity_subject_text)
+          resourceHandler.getStringInLocale(R.string.admin_auth_activity_subheading_text)
       }
     }
   }

app/src/main/java/org/oppia/android/app/profile/AdminSettingsDialogFragmentPresenter.kt

@@ -60,7 +60,7 @@ class AdminSettingsDialogFragmentPresenter @Inject constructor(
     val dialog = AlertDialog.Builder(activity, R.style.OppiaAlertDialogTheme)
       .setTitle(R.string.admin_settings_dialog_heading)
       .setView(binding.root)
-      .setMessage(R.string.admin_settings_dialog_subject_text)
+      .setMessage(R.string.admin_settings_dialog_message_text)
       .setPositiveButton(R.string.admin_settings_dialog_submit_button_text, null)
       .setNegativeButton(R.string.admin_settings_dialog_cancel_button_text) { dialog, _ ->
         dialog.dismiss()

app/src/main/res/layout-sw600dp/administrator_controls_profile_view.xml

@@ -26,7 +26,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="16dp"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_fragment_profile_management_text"
+      android:text="@string/administrator_controls_fragment_profile_management_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -78,7 +78,7 @@
           android:layout_width="0dp"
           android:layout_height="wrap_content"
           android:layout_marginTop="12dp"
-          android:text="@string/admin_auth_activity_subject_text"
+          android:text="@string/admin_auth_activity_subheading_text"
           android:textColor="@color/component_color_shared_secondary_2_text_color"
           app:layout_constraintEnd_toEndOf="@id/admin_auth_heading_textview"
           app:layout_constraintStart_toStartOf="@id/admin_auth_heading_textview"

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

@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_controls_download_permissions_view_download_permissions_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_fragment_download_permissions_text"
+      android:text="@string/administrator_controls_fragment_download_permissions_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/topic_update_on_wifi_constraint_layout"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -22,7 +22,7 @@
       android:paddingTop="28dp"
       android:paddingEnd="@dimen/administrator_controls_profile_view_profile_management_text_view_padding_end"
       android:paddingBottom="20dp"
-      android:text="@string/administrator_controls_fragment_profile_management_text"
+      android:text="@string/administrator_controls_fragment_profile_management_label"
       android:textColor="@color/component_color_shared_active_text_color"
       app:layout_constraintBottom_toTopOf="@id/edit_profiles_text_view"
       app:layout_constraintEnd_toEndOf="parent"

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

@@ -7,13 +7,13 @@
     android:id="@+id/open_dialog_0"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/concept_card_test_activity_one_button_text"
+    android:text="@string/concept_card_test_activity_button_one_text"
     android:textAllCaps="false"/>
 
   <Button
     android:id="@+id/open_dialog_1"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:text="@string/concept_card_test_activity_two_button_text"
+    android:text="@string/concept_card_test_activity_button_two_text"
     android:textAllCaps="false" />
 </LinearLayout>

app/src/main/res/values-ar/strings.xml

@@ -225,8 +225,8 @@
   <string name="admin_auth_activity_add_profiles_title">أمّن الحساب لإضافة ملفات شخصية</string>
   <string name="admin_auth_activity_access_controls_title">أمّن الحساب للوصول إلى أدوات تحكم المشرف</string>
   <string name="admin_auth_activity_heading_text">إذن المشرف مطلوب</string>
-  <string name="admin_auth_activity_subject_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تُنشئ حسابًا جديدًا.</string>
-  <string name="admin_auth_activity_controls_subject_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تصل إلى أدوات تحكم المشرف.</string>
+  <string name="admin_auth_activity_subheading_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تُنشئ حسابًا جديدًا.</string>
+  <string name="admin_auth_activity_controls_subheading_text">أدخل رقم التعريف الشخصي الخاص بالمشرف لكي تصل إلى أدوات تحكم المشرف.</string>
   <string name="admin_auth_activity_input_pin_hint_text">رقم التعريف الشخصي الخاص بالمشرف</string>
   <string name="admin_auth_activity_incorrect_pin_label">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
   <string name="admin_auth_activity_null_pin_input_label">من فضلك أدخل رقم التعريف الشخصي الخاص بالمشرف.</string>
@@ -240,7 +240,7 @@
   <string name="admin_pin_activity_wrong_pin_text">برجاء التأكد من تطابق رقمي التعريف الشخصي.</string>
   <string name="admin_pin_activity_submit_button_text">حفظ</string>
   <string name="admin_pin_activity_title">أمّن الحساب لإضافة ملفات شخصية</string>
-  <string name="add_profile_activity_text">إضافة ملف شخصي</string>
+  <string name="add_profile_activity_title">إضافة ملف شخصي</string>
   <string name="add_profile_activity_input_name_hint">الاسم</string>
   <string name="add_profile_activity_input_pin_hint">رقم تعريف شخصي مكون من 3 أرقام</string>
   <string name="add_profile_activity_input_confirm_pin_hint">تأكيد رقم التعريف الشخصي المكون من 3 أرقام</string>
@@ -292,7 +292,7 @@
   <string name="pin_password_activity_toolbar_title">أدخل رقم التعريف الشخصي</string>
   <string name="admin_settings_dialog_input_pin_hint">رقم التعريف الشخصي الخاص بالمشرف</string>
   <string name="admin_settings_dialog_heading">الوصول إلى إعدادات المشرف</string>
-  <string name="admin_settings_dialog_subject_text">رقم التعريف الشخصي الخاص بالمشرف مطلوب لتغيير رقم التعريف الشخصي الخاص بالمستخدم</string>
+  <string name="admin_settings_dialog_message_text">رقم التعريف الشخصي الخاص بالمشرف مطلوب لتغيير رقم التعريف الشخصي الخاص بالمستخدم</string>
   <string name="admin_settings_dialog_cancel_button_text">إلغاء</string>
   <string name="admin_settings_dialog_submit_button_text">تقديم</string>
   <string name="admin_settings_dialog_incorrect_pin_error_text">رقم التعريف الشخصي الخاص بالمشرف غير صحيح. من فضلك حاول مجددًا.</string>
@@ -346,9 +346,9 @@
   <string name="next_text">التالي</string>
   <string name="administrator_controls_fragment_general_label">عام</string>
   <string name="administrator_controls_fragment_edit_account_text">تعديل الحساب</string>
-  <string name="administrator_controls_fragment_profile_management_text">إدارة الملف الشخصي</string>
+  <string name="administrator_controls_fragment_profile_management_label">إدارة الملف الشخصي</string>
   <string name="administrator_controls_fragment_edit_profiles_text">تعديل الملفات الشخصية</string>
-  <string name="administrator_controls_fragment_download_permissions_text">أُذونات التنزيل</string>
+  <string name="administrator_controls_fragment_download_permissions_label">أُذونات التنزيل</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_text">تنزيل وتحديث عن طريق شبكة الوايفاي فقط</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_description">سيتم تحميل وتحديث المواضيع عن طريق شبكة الوايفاي فقط. أي تنزيلات أو تحديثات عن طريق بيانات الهاتف سيتم وضعها في قائمة الانتظار.</string>
   <string name="administrator_controls_fragment_auto_update_topic_text">تحديث المواضيع تلقائيًا</string>

app/src/main/res/values-pt-rBR/strings.xml

@@ -207,8 +207,8 @@
   <string name="admin_auth_activity_add_profiles_title">Autorize para adicionar perfis</string>
   <string name="admin_auth_activity_access_controls_title">Autorize para acessar os Controles do Administrador</string>
   <string name="admin_auth_activity_heading_text">Autorização do administrador necessária</string>
-  <string name="admin_auth_activity_subject_text">Insira o PIN do administrador para criar uma nova conta.</string>
-  <string name="admin_auth_activity_controls_subject_text">Insira o PIN do administrador para acessar os Controles do Administrador.</string>
+  <string name="admin_auth_activity_subheading_text">Insira o PIN do administrador para criar uma nova conta.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Insira o PIN do administrador para acessar os Controles do Administrador.</string>
   <string name="admin_auth_activity_input_pin_hint_text">PIN do Administrador</string>
   <string name="admin_auth_activity_incorrect_pin_label">PIN do administrador incorreto. Por favor, tente novamente.</string>
   <string name="admin_auth_activity_null_pin_input_label">Insira o PIN do administrador.</string>
@@ -222,7 +222,7 @@
   <string name="admin_pin_activity_wrong_pin_text">Certifique-se de que os dois PINs coincidam.</string>
   <string name="admin_pin_activity_submit_button_text">Salvar</string>
   <string name="admin_pin_activity_title">Autorize para adicionar perfis</string>
-  <string name="add_profile_activity_text">Novo Perfil</string>
+  <string name="add_profile_activity_title">Novo Perfil</string>
   <string name="add_profile_activity_input_name_hint">Nome</string>
   <string name="add_profile_activity_input_pin_hint">PIN de 3 dígitos</string>
   <string name="add_profile_activity_input_confirm_pin_hint">Confirmar PIN de 3 dígitos</string>
@@ -274,7 +274,7 @@
   <string name="pin_password_activity_toolbar_title">Insira o PIN</string>
   <string name="admin_settings_dialog_input_pin_hint">PIN do Administrador</string>
   <string name="admin_settings_dialog_heading">Acesso às configurações do administrador</string>
-  <string name="admin_settings_dialog_subject_text">PIN do administrador necessário para alterar o PIN do usuário</string>
+  <string name="admin_settings_dialog_message_text">PIN do administrador necessário para alterar o PIN do usuário</string>
   <string name="admin_settings_dialog_cancel_button_text">Cancelar</string>
   <string name="admin_settings_dialog_submit_button_text">Enviar</string>
   <string name="admin_settings_dialog_incorrect_pin_error_text">PIN do administrador incorreto. Por favor, tente novamente.</string>
@@ -328,9 +328,9 @@
   <string name="next_text">Próximo</string>
   <string name="administrator_controls_fragment_general_label">Geral</string>
   <string name="administrator_controls_fragment_edit_account_text">Editar conta</string>
-  <string name="administrator_controls_fragment_profile_management_text">Gerenciamento de Perfil</string>
+  <string name="administrator_controls_fragment_profile_management_label">Gerenciamento de Perfil</string>
   <string name="administrator_controls_fragment_edit_profiles_text">Editar perfis</string>
-  <string name="administrator_controls_fragment_download_permissions_text">Permissões de Download</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Permissões de Download</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_text">Baixar e atualizar apenas com Wi-fi</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_description">Os tópicos serão baixados e atualizados apenas com Wi-fi. Quaisquer downloads ou atualizações de dados do celular serão enfileirados.</string>
   <string name="administrator_controls_fragment_auto_update_topic_text">Atualizar tópicos automaticamente</string>

app/src/main/res/values-sw/strings.xml

@@ -177,8 +177,8 @@
   <string name="admin_auth_activity_add_profiles_title">Idhinisha kuongeza wasifu</string>
   <string name="admin_auth_activity_access_controls_title">Idhinisha kufikia Vidhibiti vya Msimamizi</string>
   <string name="admin_auth_activity_heading_text">Idhini ya Msimamizi Inahitajika</string>
-  <string name="admin_auth_activity_subject_text">Weka Nambari ya Siri ya Msimamizi ili kuunda akaunti mpya.</string>
-  <string name="admin_auth_activity_controls_subject_text">Weka Nambari ya Siri ya Msimamizi ili kufikia Vidhibiti vya Msimamizi.</string>
+  <string name="admin_auth_activity_subheading_text">Weka Nambari ya Siri ya Msimamizi ili kuunda akaunti mpya.</string>
+  <string name="admin_auth_activity_controls_subheading_text">Weka Nambari ya Siri ya Msimamizi ili kufikia Vidhibiti vya Msimamizi.</string>
   <string name="admin_auth_activity_input_pin_hint_text">Nambari ya Siri ya Msimamizi</string>
   <string name="admin_auth_activity_incorrect_pin_label">Nambari ya Siri ya Msimamizi si Sahihi. Tafadhali jaribu tena.</string>
   <string name="admin_auth_activity_null_pin_input_label">Tafadhali weka Nambari ya Siri ya Msimamizi.</string>
@@ -192,7 +192,7 @@
   <string name="admin_pin_activity_wrong_pin_text">Tafadhali hakikisha kwamba Nambari za Siri zote mbili zinalingana.</string>
   <string name="admin_pin_activity_submit_button_text">Hifadhi</string>
   <string name="admin_pin_activity_title">Idhinisha kuongeza wasifu</string>
-  <string name="add_profile_activity_text">Ongeza Wasifu</string>
+  <string name="add_profile_activity_title">Ongeza Wasifu</string>
   <string name="add_profile_activity_input_name_hint" fuzzy="true">Jina</string>
   <string name="add_profile_activity_input_pin_hint" fuzzy="true">Nambari ya Siri ya tarakimu 3</string>
   <string name="add_profile_activity_input_confirm_pin_hint">Thibitisha Nambari ya Siri ya tarakimu 3</string>
@@ -239,7 +239,7 @@
   <string name="pin_password_activity_toolbar_title">Weka Nambari ya Siri</string>
   <string name="admin_settings_dialog_input_pin_hint">Nambari ya Siri ya Msimamizi</string>
   <string name="admin_settings_dialog_heading">Ufikiaji wa mipangilio ya msimamizi</string>
-  <string name="admin_settings_dialog_subject_text">Nambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
+  <string name="admin_settings_dialog_message_text">Nambari ya Siri ya Msimamizi inahitajika ili kubadilisha Nambari ya Siri ya mtumiaji</string>
   <string name="admin_settings_dialog_cancel_button_text">Ghairi</string>
   <string name="admin_settings_dialog_submit_button_text">Wasilisha</string>
   <string name="admin_settings_dialog_incorrect_pin_error_text">Nambari ya Siri ya msimamizi si Sahihi. Tafadhali jaribu tena.</string>
@@ -286,9 +286,9 @@
   <string name="next_text">Inayofuata</string>
   <string name="administrator_controls_fragment_general_label">Jumla</string>
   <string name="administrator_controls_fragment_edit_account_text">Hariri akaunti</string>
-  <string name="administrator_controls_fragment_profile_management_text">Usimamizi wa Wasifu</string>
+  <string name="administrator_controls_fragment_profile_management_label">Usimamizi wa Wasifu</string>
   <string name="administrator_controls_fragment_edit_profiles_text">Hariri wasifu</string>
-  <string name="administrator_controls_fragment_download_permissions_text">Ruhusa ya kupakua</string>
+  <string name="administrator_controls_fragment_download_permissions_label">Ruhusa ya kupakua</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_text">Pakua na usasishe kwenye Wi-fi pekee</string>
   <string name="administrator_controls_fragment_topic_update_on_wifi_description">Mada zitapakuliwa na kusasishwa kwenye Wi-fi pekee. Vipakuliwa au masasisho yoyote ya data ya mtandao wa simu yatawekwa kwenye foleni.</string>
   <string name="administrator_controls_fragment_auto_update_topic_text">Sasisha mada moja kwa moja</string>