From 20a35edb1f52e949cdc485cbf33d95ac23a43627 Mon Sep 17 00:00:00 2001
From: GitHub Agent <agent@github-issue-agent.dev>
Date: Sat, 18 Jul 2026 18:42:54 +0530
Subject: [PATCH] Solution for #3384: Arrange string resources based on screens

---
 path/to/ActivityComponent.kt                  | 26 ++++++++++++++
 path/to/ActivityComponentImpl.kt              | 26 ++++++++++++++
 path/to/AdministratorControlsActivity.kt      | 11 ++++++
 .../AdministratorControlsActivity_strings.xml |  9 +++++
 path/to/AppVersionActivity.kt                 | 11 ++++++
 path/to/AppVersionActivity_strings.xml        |  9 +++++
 path/to/LearnerAnalyticsActivity.kt           | 11 ++++++
 path/to/LearnerAnalyticsActivity_strings.xml  |  8 +++++
 path/to/strings.xml                           | 36 +++++++++++++++++++
 9 files changed, 147 insertions(+)
 create mode 100644 path/to/ActivityComponent.kt
 create mode 100644 path/to/ActivityComponentImpl.kt
 create mode 100644 path/to/AdministratorControlsActivity.kt
 create mode 100644 path/to/AdministratorControlsActivity_strings.xml
 create mode 100644 path/to/AppVersionActivity.kt
 create mode 100644 path/to/AppVersionActivity_strings.xml
 create mode 100644 path/to/LearnerAnalyticsActivity.kt
 create mode 100644 path/to/LearnerAnalyticsActivity_strings.xml
 create mode 100644 path/to/strings.xml

diff --git a/path/to/ActivityComponent.kt b/path/to/ActivityComponent.kt
new file mode 100644
index 00000000000..590d0fd54a2
--- /dev/null
+++ b/path/to/ActivityComponent.kt
@@ -0,0 +1,26 @@
+# complete code
+package org.oppia.android.app.activity
+
+import org.oppia.android.app.injector.ActivityComponent
+import org.oppia.android.app.injector.ActivityComponentImpl
+import org.oppia.android.app.injector.ActivityIntentFactories
+import org.oppia.android.app.injector.ActivityIntentFactoriesModule
+import org.oppia.android.app.injector.ActivityModule
+import org.oppia.android.app.injector.ActivityScope
+import org.oppia.android.app.injector.Injector
+
+class ActivityComponent(
+    private val activityIntentFactories: ActivityIntentFactories,
+    private val activityModule: ActivityModule,
+    private val activityScope: ActivityScope,
+    private val injector: Injector
+) : ActivityComponent {
+    override fun get(activity: String): ActivityComponentImpl {
+        return ActivityComponentImpl(
+            activityIntentFactories,
+            activityModule,
+            activityScope,
+            injector
+        )
+    }
+}
\ No newline at end of file
diff --git a/path/to/ActivityComponentImpl.kt b/path/to/ActivityComponentImpl.kt
new file mode 100644
index 00000000000..dab3c798e98
--- /dev/null
+++ b/path/to/ActivityComponentImpl.kt
@@ -0,0 +1,26 @@
+# complete code
+package org.oppia.android.app.activity
+
+import org.oppia.android.app.injector.ActivityComponent
+import org.oppia.android.app.injector.ActivityComponentImpl
+import org.oppia.android.app.injector.ActivityIntentFactories
+import org.oppia.android.app.injector.ActivityIntentFactoriesModule
+import org.oppia.android.app.injector.ActivityModule
+import org.oppia.android.app.injector.ActivityScope
+import org.oppia.android.app.injector.Injector
+
+class ActivityComponentImpl(
+    private val activityIntentFactories: ActivityIntentFactories,
+    private val activityModule: ActivityModule,
+    private val activityScope: ActivityScope,
+    private val injector: Injector
+) : ActivityComponentImpl() {
+    override fun get(activity: String): ActivityComponentImpl {
+        return ActivityComponentImpl(
+            activityIntentFactories,
+            activityModule,
+            activityScope,
+            injector
+        )
+    }
+}
\ No newline at end of file
diff --git a/path/to/AdministratorControlsActivity.kt b/path/to/AdministratorControlsActivity.kt
new file mode 100644
index 00000000000..8a25ed9d179
--- /dev/null
+++ b/path/to/AdministratorControlsActivity.kt
@@ -0,0 +1,11 @@
+# complete code
+package org.oppia.android.app.administratorcontrols
+
+import org.oppia.android.app.injector.InjectableAppCompatActivity
+
+class AdministratorControlsActivity : InjectableAppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_administrator_controls)
+    }
+}
\ No newline at end of file
diff --git a/path/to/AdministratorControlsActivity_strings.xml b/path/to/AdministratorControlsActivity_strings.xml
new file mode 100644
index 00000000000..cd0f43a8a1d
--- /dev/null
+++ b/path/to/AdministratorControlsActivity_strings.xml
@@ -0,0 +1,9 @@
+# complete code
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- AdministratorControlActivity -->
+    <string name="administrator_controls_activity_title">Administrator Controls</string>
+    <string name="administrator_controls_activity_app_version_item">App Version</string>
+    <string name="administrator_controls_activity_account_actions_label">Account Actions</string>
+    <string name="administrator_controls_activity_logout_item_text">Logout</string>
+</resources>
\ No newline at end of file
diff --git a/path/to/AppVersionActivity.kt b/path/to/AppVersionActivity.kt
new file mode 100644
index 00000000000..64706941b60
--- /dev/null
+++ b/path/to/AppVersionActivity.kt
@@ -0,0 +1,11 @@
+# complete code
+package org.oppia.android.app.administratorcontrols.appversion
+
+import org.oppia.android.app.injector.InjectableAppCompatActivity
+
+class AppVersionActivity : InjectableAppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_app_version)
+    }
+}
\ No newline at end of file
diff --git a/path/to/AppVersionActivity_strings.xml b/path/to/AppVersionActivity_strings.xml
new file mode 100644
index 00000000000..25c1e8b7eaf
--- /dev/null
+++ b/path/to/AppVersionActivity_strings.xml
@@ -0,0 +1,9 @@
+# complete code
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- AppVersionActivity -->
+    <string name="app_version_activity_title">App Version</string>
+    <string name="app_version_activity_app_version_item">App Version</string>
+    <string name="app_version_activity_account_actions_label">Account Actions</string>
+    <string name="app_version_activity_logout_item_text">Logout</string>
+</resources>
\ No newline at end of file
diff --git a/path/to/LearnerAnalyticsActivity.kt b/path/to/LearnerAnalyticsActivity.kt
new file mode 100644
index 00000000000..57f4e62eb64
--- /dev/null
+++ b/path/to/LearnerAnalyticsActivity.kt
@@ -0,0 +1,11 @@
+# complete code
+package org.oppia.android.app.administratorcontrols.learneranalytics
+
+import org.oppia.android.app.injector.InjectableAppCompatActivity
+
+class LearnerAnalyticsActivity : InjectableAppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_learner_analytics)
+    }
+}
\ No newline at end of file
diff --git a/path/to/LearnerAnalyticsActivity_strings.xml b/path/to/LearnerAnalyticsActivity_strings.xml
new file mode 100644
index 00000000000..794c1480b22
--- /dev/null
+++ b/path/to/LearnerAnalyticsActivity_strings.xml
@@ -0,0 +1,8 @@
+# complete code
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- LearnerAnalyticsActivity -->
+    <string name="learner_analytics_activity_title">Learner Analytics</string>
+    <string name="learner_analytics_activity_profile_label">Profile</string>
+    <string name="learner_analytics_activity_device_id_label">Device ID</string>
+</resources>
\ No newline at end of file
diff --git a/path/to/strings.xml b/path/to/strings.xml
new file mode 100644
index 00000000000..6fd8011cd57
--- /dev/null
+++ b/path/to/strings.xml
@@ -0,0 +1,36 @@
+# complete code
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Screen/Toolbar Titles -->
+    <!-- AdministratorControlActivity -->
+    <string name="administrator_controls_activity_title">Administrator Controls</string>
+    <string name="administrator_controls_activity_app_version_item">App Version</string>
+    <string name="administrator_controls_activity_account_actions_label">Account Actions</string>
+    <string name="administrator_controls_activity_logout_item_text">Logout</string>
+    <!-- AppContentActivity -->
+    <string name="app_content_activity_title">App Content</string>
+    <string name="app_content_activity_profile_management_label">Profile Management</string>
+    <string name="app_content_activity_account_actions_label">Account Actions</string>
+    <string name="app_content_activity_logout_item_text">Logout</string>
+    <!-- ProfileResetPinActivity -->
+    <string name="profile_reset_pin_activity_title">Profile Reset Pin</string>
+    <string name="profile_reset_pin_activity_pin_label">Pin</string>
+    <string name="profile_reset_pin_activity_reset_label">Reset</string>
+    <!-- ProfileAndDeviceIdActivity -->
+    <string name="profile_and_device_id_activity_title">Profile and Device ID</string>
+    <string name="profile_and_device_id_activity_profile_label">Profile</string>
+    <string name="profile_and_device_id_activity_device_id_label">Device ID</string>
+    <!-- GeneralAvailabilityUpgradeNoticeDialogFragment -->
+    <string name="general_availability_upgrade_notice_dialog_fragment_title">General Availability Upgrade Notice</string>
+    <string name="general_availability_upgrade_notice_dialog_fragment_message">This is a message.</string>
+    <!-- ProgressDatabaseFullDialog -->
+    <string name="progress_database_full_dialog_title">Progress Database Full</string>
+    <string name="progress_database_full_dialog_message">This is a message.</string>
+    <!-- Shared Strings -->
+    <string name="reading_text_size_item_text_small">Small</string>
+    <string name="reading_text_size_item_medium">Medium</string>
+    <!-- Test Strings -->
+    <string name="test_file_name_view_component_type">Test File Name View Component Type</string>
+    <!-- Dialogs -->
+    <string name="dialog_name_view_component_type">Dialog Name View Component Type</string>
+</resources>
\ No newline at end of file