From 54c7bd1bf0938dcbee81f3accd58e5deed563830 Mon Sep 17 00:00:00 2001
From: Ayush <theayushyadav11@gmail.com>
Date: Mon, 21 Oct 2024 23:05:20 +0530
Subject: [PATCH 1/5] Fix: Use finish() instead of intent for smoother
 navigation (#3641)

---
 .../org/oppia/android/app/profile/AddProfileActivity.kt    | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
index 1acff5fd581..8b9bcf3bbca 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
@@ -4,13 +4,13 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
+import javax.inject.Inject
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.model.AddProfileActivityParams
 import org.oppia.android.app.model.ScreenName.ADD_PROFILE_ACTIVITY
 import org.oppia.android.util.extensions.putProtoExtra
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
-import javax.inject.Inject
 
 /** Activity that allows users to create new profiles. */
 class AddProfileActivity : InjectableAutoLocalizedAppCompatActivity() {
@@ -44,10 +44,7 @@ class AddProfileActivity : InjectableAutoLocalizedAppCompatActivity() {
   }
 
   override fun onSupportNavigateUp(): Boolean {
-    // TODO(#3641): Investigate on using finish instead of intent.
-    val intent = Intent(this, ProfileChooserActivity::class.java)
-    intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
-    startActivity(intent)
+    finish()
     return false
   }
 

From 32b1dca2dcbb2e2ace78b788b850f46a8230b9a9 Mon Sep 17 00:00:00 2001
From: Ayush <theayushyadav11@gmail.com>
Date: Mon, 28 Oct 2024 19:56:25 +0530
Subject: [PATCH 2/5] Removed TODO

---
 .idea/codeStyles/Project.xml                                  | 4 +---
 .../org/oppia/android/app/drawer/ExitProfileDialogFragment.kt | 1 -
 .../java/org/oppia/android/app/profile/AddProfileActivity.kt  | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 66d46e74f0c..2ae2a26048e 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,8 +5,6 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
-      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>
@@ -161,4 +159,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
+</component>
\ No newline at end of file
diff --git a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
index 7900163e9a5..2dfdd918fc7 100644
--- a/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
+++ b/app/src/main/java/org/oppia/android/app/drawer/ExitProfileDialogFragment.kt
@@ -70,7 +70,6 @@ class ExitProfileDialogFragment : InjectableDialogFragment() {
         dialog.dismiss()
       }
       .setPositiveButton(R.string.home_activity_back_dialog_exit) { _, _ ->
-        // TODO(#3641): Investigate on using finish instead of intent.
         val intent = ProfileChooserActivity.createProfileChooserActivity(activity!!)
         if (!restoreLastCheckedItem) {
           intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
diff --git a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
index 8b9bcf3bbca..c7d0e60857c 100644
--- a/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/AddProfileActivity.kt
@@ -4,13 +4,13 @@ import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts
-import javax.inject.Inject
 import org.oppia.android.app.activity.ActivityComponentImpl
 import org.oppia.android.app.activity.InjectableAutoLocalizedAppCompatActivity
 import org.oppia.android.app.model.AddProfileActivityParams
 import org.oppia.android.app.model.ScreenName.ADD_PROFILE_ACTIVITY
 import org.oppia.android.util.extensions.putProtoExtra
 import org.oppia.android.util.logging.CurrentAppScreenNameIntentDecorator.decorateWithScreenName
+import javax.inject.Inject
 
 /** Activity that allows users to create new profiles. */
 class AddProfileActivity : InjectableAutoLocalizedAppCompatActivity() {

From 6fb90cd35f8ef90b01a7e704a36a89eb0840fe77 Mon Sep 17 00:00:00 2001
From: Ayush <theayushyadav11@gmail.com>
Date: Wed, 13 Nov 2024 21:04:19 +0530
Subject: [PATCH 3/5] Added test for  BackPress

---
 .idea/codeStyles/Project.xml                  | 162 ------------------
 .../app/profile/AddProfileActivityTest.kt     | 148 ++++++++--------
 2 files changed, 80 insertions(+), 230 deletions(-)
 delete mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
deleted file mode 100644
index 2ae2a26048e..00000000000
--- a/.idea/codeStyles/Project.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
-    </JavaCodeStyleSettings>
-    <JetCodeStyleSettings>
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-    </JetCodeStyleSettings>
-    <XML>
-      <option name="XML_KEEP_LINE_BREAKS_IN_TEXT" value="false" />
-      <option name="XML_KEEP_BLANK_LINES" value="0" />
-      <option name="XML_WHITE_SPACE_AROUND_CDATA" value="1" />
-    </XML>
-    <codeStyleSettings language="Groovy">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JAVA">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="PROTO">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="XML">
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-      <arrangement>
-        <rules>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:android</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>xmlns:.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:id</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>name</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>style</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>^$</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>ANDROID_ATTRIBUTE_ORDER</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_ATTRIBUTE />
-                  <XML_NAMESPACE>.*</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-        </rules>
-      </arrangement>
-    </codeStyleSettings>
-    <codeStyleSettings language="kotlin">
-      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
-      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
-      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
-      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="4" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>
\ No newline at end of file
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
index 6e4992389cd..17a7cc4e476 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
@@ -10,9 +10,11 @@ import android.content.res.Resources
 import android.net.Uri
 import android.provider.MediaStore
 import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
 import androidx.test.espresso.action.ViewActions.click
 import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
 import androidx.test.espresso.action.ViewActions.pressImeActionButton
@@ -38,6 +40,8 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import dagger.Component
+import javax.inject.Inject
+import javax.inject.Singleton
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.not
@@ -125,8 +129,6 @@ import org.oppia.android.util.parser.image.GlideImageLoaderModule
 import org.oppia.android.util.parser.image.ImageParsingModule
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
-import javax.inject.Inject
-import javax.inject.Singleton
 
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
@@ -1749,81 +1751,91 @@ class AddProfileActivityTest {
     assertThat(currentScreenName).isEqualTo(ScreenName.ADD_PROFILE_ACTIVITY)
   }
 
-  private fun createAddProfileActivityIntent(): Intent {
-    return AddProfileActivity.createAddProfileActivityIntent(
-      ApplicationProvider.getApplicationContext(),
-      colorRgb = -10710042
-    )
+  @Test
+  fun testAddProfileActivity_onBackPressed_finishActivity() {
+    val scenario = launch(AddProfileActivity::class.java)
+    onView(isRoot()).perform(ViewActions.pressBack())
+    testCoroutineDispatchers.runCurrent()
+    scenario.onActivity { activity ->
+      assertThat(activity.isFinishing).isTrue()
+    }
   }
 
-  private fun createGalleryPickActivityResultStub(): ActivityResult {
-    val resources: Resources = context.resources
-    val imageUri = Uri.parse(
-      ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
-        resources.getResourcePackageName(R.mipmap.launcher_icon) + '/' +
-        resources.getResourceTypeName(R.mipmap.launcher_icon) + '/' +
-        resources.getResourceEntryName(R.mipmap.launcher_icon)
-    )
-    val resultIntent = Intent()
-    resultIntent.data = imageUri
-    return ActivityResult(RESULT_OK, resultIntent)
-  }
+  private fun createAddProfileActivityIntent(): Intent {
+  return AddProfileActivity.createAddProfileActivityIntent(
+    ApplicationProvider.getApplicationContext(),
+    colorRgb = -10710042
+  )
+}
 
-  // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
-  @Singleton
-  @Component(
-    modules = [
-      RobolectricModule::class, TestDispatcherModule::class, ApplicationModule::class,
-      TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
-      LoggerModule::class, ContinueModule::class, FractionInputModule::class,
-      ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
-      NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
-      DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
-      GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
-      HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
-      AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class,
-      ExpirationMetaDataRetrieverModule::class,
-      ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class,
-      ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
-      HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class,
-      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
-      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-      ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
-      NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
-      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
-      NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
-      MathEquationInputModule::class, SplitScreenInteractionModule::class,
-      LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
-      SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
-      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
-      CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
-      TestAuthenticationModule::class
-    ]
+private fun createGalleryPickActivityResultStub(): ActivityResult {
+  val resources: Resources = context.resources
+  val imageUri = Uri.parse(
+    ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
+      resources.getResourcePackageName(R.mipmap.launcher_icon) + '/' +
+      resources.getResourceTypeName(R.mipmap.launcher_icon) + '/' +
+      resources.getResourceEntryName(R.mipmap.launcher_icon)
   )
-  interface TestApplicationComponent : ApplicationComponent {
-    @Component.Builder
-    interface Builder : ApplicationComponent.Builder {
-      override fun build(): TestApplicationComponent
-    }
+  val resultIntent = Intent()
+  resultIntent.data = imageUri
+  return ActivityResult(RESULT_OK, resultIntent)
+}
 
-    fun inject(addProfileActivityTest: AddProfileActivityTest)
+// TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
+@Singleton
+@Component(
+  modules = [
+    RobolectricModule::class, TestDispatcherModule::class, ApplicationModule::class,
+    TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
+    LoggerModule::class, ContinueModule::class, FractionInputModule::class,
+    ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
+    NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
+    DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
+    GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
+    HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
+    AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class,
+    ExpirationMetaDataRetrieverModule::class,
+    ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class,
+    ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
+    HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class,
+    FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+    DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+    ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+    NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
+    AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+    NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
+    MathEquationInputModule::class, SplitScreenInteractionModule::class,
+    LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
+    SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
+    EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+    CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
+    TestAuthenticationModule::class
+  ]
+)
+interface TestApplicationComponent : ApplicationComponent {
+  @Component.Builder
+  interface Builder : ApplicationComponent.Builder {
+    override fun build(): TestApplicationComponent
   }
 
-  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
-    private val component: TestApplicationComponent by lazy {
-      DaggerAddProfileActivityTest_TestApplicationComponent.builder()
-        .setApplication(this)
-        .build() as TestApplicationComponent
-    }
+  fun inject(addProfileActivityTest: AddProfileActivityTest)
+}
 
-    fun inject(addProfileActivityTest: AddProfileActivityTest) {
-      component.inject(addProfileActivityTest)
-    }
+class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+  private val component: TestApplicationComponent by lazy {
+    DaggerAddProfileActivityTest_TestApplicationComponent.builder()
+      .setApplication(this)
+      .build() as TestApplicationComponent
+  }
 
-    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
-      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
-    }
+  fun inject(addProfileActivityTest: AddProfileActivityTest) {
+    component.inject(addProfileActivityTest)
+  }
 
-    override fun getApplicationInjector(): ApplicationInjector = component
+  override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+    return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
   }
+
+  override fun getApplicationInjector(): ApplicationInjector = component
+}
 }

From 5c73e27380859ec179258a6de1374bc5de7fc94b Mon Sep 17 00:00:00 2001
From: Ayush <theayushyadav11@gmail.com>
Date: Wed, 13 Nov 2024 21:19:11 +0530
Subject: [PATCH 4/5] added test for BackPress

---
 .idea/codeStyles/Project.xml                  | 162 ++++++++++++++++++
 .../app/profile/AddProfileActivityTest.kt     | 140 ++++++++-------
 2 files changed, 231 insertions(+), 71 deletions(-)
 create mode 100644 .idea/codeStyles/Project.xml

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 00000000000..2ae2a26048e
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,162 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
+    </JavaCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <XML>
+      <option name="XML_KEEP_LINE_BREAKS_IN_TEXT" value="false" />
+      <option name="XML_KEEP_BLANK_LINES" value="0" />
+      <option name="XML_WHITE_SPACE_AROUND_CDATA" value="1" />
+    </XML>
+    <codeStyleSettings language="Groovy">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="PROTO">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+      <arrangement>
+        <rules>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
+            </rule>
+          </section>
+          <section>
+            <rule>
+              <match>
+                <AND>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
+                </AND>
+              </match>
+              <order>BY_NAME</order>
+            </rule>
+          </section>
+        </rules>
+      </arrangement>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+      <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+      <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
index 17a7cc4e476..eb61ddea613 100644
--- a/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/android/app/profile/AddProfileActivityTest.kt
@@ -10,7 +10,6 @@ import android.content.res.Resources
 import android.net.Uri
 import android.provider.MediaStore
 import androidx.appcompat.app.AppCompatActivity
-import androidx.test.core.app.ActivityScenario
 import androidx.test.core.app.ActivityScenario.launch
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.espresso.Espresso.onView
@@ -40,8 +39,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.rule.ActivityTestRule
 import com.google.common.truth.Truth.assertThat
 import dagger.Component
-import javax.inject.Inject
-import javax.inject.Singleton
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
 import org.hamcrest.Matchers.not
@@ -129,6 +126,8 @@ import org.oppia.android.util.parser.image.GlideImageLoaderModule
 import org.oppia.android.util.parser.image.ImageParsingModule
 import org.robolectric.annotation.Config
 import org.robolectric.annotation.LooperMode
+import javax.inject.Inject
+import javax.inject.Singleton
 
 @RunWith(AndroidJUnit4::class)
 @LooperMode(LooperMode.Mode.PAUSED)
@@ -1760,82 +1759,81 @@ class AddProfileActivityTest {
       assertThat(activity.isFinishing).isTrue()
     }
   }
-
   private fun createAddProfileActivityIntent(): Intent {
-  return AddProfileActivity.createAddProfileActivityIntent(
-    ApplicationProvider.getApplicationContext(),
-    colorRgb = -10710042
-  )
-}
+    return AddProfileActivity.createAddProfileActivityIntent(
+      ApplicationProvider.getApplicationContext(),
+      colorRgb = -10710042
+    )
+  }
+
+  private fun createGalleryPickActivityResultStub(): ActivityResult {
+    val resources: Resources = context.resources
+    val imageUri = Uri.parse(
+      ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
+        resources.getResourcePackageName(R.mipmap.launcher_icon) + '/' +
+        resources.getResourceTypeName(R.mipmap.launcher_icon) + '/' +
+        resources.getResourceEntryName(R.mipmap.launcher_icon)
+    )
+    val resultIntent = Intent()
+    resultIntent.data = imageUri
+    return ActivityResult(RESULT_OK, resultIntent)
+  }
 
-private fun createGalleryPickActivityResultStub(): ActivityResult {
-  val resources: Resources = context.resources
-  val imageUri = Uri.parse(
-    ContentResolver.SCHEME_ANDROID_RESOURCE + "://" +
-      resources.getResourcePackageName(R.mipmap.launcher_icon) + '/' +
-      resources.getResourceTypeName(R.mipmap.launcher_icon) + '/' +
-      resources.getResourceEntryName(R.mipmap.launcher_icon)
+  // TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
+  @Singleton
+  @Component(
+    modules = [
+      RobolectricModule::class, TestDispatcherModule::class, ApplicationModule::class,
+      TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
+      LoggerModule::class, ContinueModule::class, FractionInputModule::class,
+      ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
+      NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
+      DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
+      GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
+      HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
+      AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class,
+      ExpirationMetaDataRetrieverModule::class,
+      ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class,
+      ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
+      HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class,
+      FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
+      DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
+      ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
+      NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
+      AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
+      NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
+      MathEquationInputModule::class, SplitScreenInteractionModule::class,
+      LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
+      SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
+      EventLoggingConfigurationModule::class, ActivityRouterModule::class,
+      CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
+      TestAuthenticationModule::class
+    ]
   )
-  val resultIntent = Intent()
-  resultIntent.data = imageUri
-  return ActivityResult(RESULT_OK, resultIntent)
-}
+  interface TestApplicationComponent : ApplicationComponent {
+    @Component.Builder
+    interface Builder : ApplicationComponent.Builder {
+      override fun build(): TestApplicationComponent
+    }
 
-// TODO(#59): Figure out a way to reuse modules instead of needing to re-declare them.
-@Singleton
-@Component(
-  modules = [
-    RobolectricModule::class, TestDispatcherModule::class, ApplicationModule::class,
-    TestPlatformParameterModule::class, PlatformParameterSingletonModule::class,
-    LoggerModule::class, ContinueModule::class, FractionInputModule::class,
-    ItemSelectionInputModule::class, MultipleChoiceInputModule::class,
-    NumberWithUnitsRuleModule::class, NumericInputRuleModule::class, TextInputRuleModule::class,
-    DragDropSortInputModule::class, ImageClickInputModule::class, InteractionsModule::class,
-    GcsResourceModule::class, GlideImageLoaderModule::class, ImageParsingModule::class,
-    HtmlParserEntityTypeModule::class, QuestionModule::class, TestLogReportingModule::class,
-    AccessibilityTestModule::class, LogStorageModule::class, CachingTestModule::class,
-    ExpirationMetaDataRetrieverModule::class,
-    ViewBindingShimModule::class, RatioInputModule::class, WorkManagerConfigurationModule::class,
-    ApplicationStartupListenerModule::class, LogReportWorkerModule::class,
-    HintsAndSolutionConfigModule::class, HintsAndSolutionProdModule::class,
-    FirebaseLogUploaderModule::class, FakeOppiaClockModule::class,
-    DeveloperOptionsStarterModule::class, DeveloperOptionsModule::class,
-    ExplorationStorageModule::class, NetworkModule::class, NetworkConfigProdModule::class,
-    NetworkConnectionUtilDebugModule::class, NetworkConnectionDebugUtilModule::class,
-    AssetModule::class, LocaleProdModule::class, ActivityRecreatorTestModule::class,
-    NumericExpressionInputModule::class, AlgebraicExpressionInputModule::class,
-    MathEquationInputModule::class, SplitScreenInteractionModule::class,
-    LoggingIdentifierModule::class, ApplicationLifecycleModule::class,
-    SyncStatusModule::class, MetricLogSchedulerModule::class, TestingBuildFlavorModule::class,
-    EventLoggingConfigurationModule::class, ActivityRouterModule::class,
-    CpuPerformanceSnapshotterModule::class, ExplorationProgressModule::class,
-    TestAuthenticationModule::class
-  ]
-)
-interface TestApplicationComponent : ApplicationComponent {
-  @Component.Builder
-  interface Builder : ApplicationComponent.Builder {
-    override fun build(): TestApplicationComponent
+    fun inject(addProfileActivityTest: AddProfileActivityTest)
   }
 
-  fun inject(addProfileActivityTest: AddProfileActivityTest)
-}
+  class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
+    private val component: TestApplicationComponent by lazy {
+      DaggerAddProfileActivityTest_TestApplicationComponent.builder()
+        .setApplication(this)
+        .build() as TestApplicationComponent
+    }
 
-class TestApplication : Application(), ActivityComponentFactory, ApplicationInjectorProvider {
-  private val component: TestApplicationComponent by lazy {
-    DaggerAddProfileActivityTest_TestApplicationComponent.builder()
-      .setApplication(this)
-      .build() as TestApplicationComponent
-  }
+    fun inject(addProfileActivityTest: AddProfileActivityTest) {
+      component.inject(addProfileActivityTest)
+    }
 
-  fun inject(addProfileActivityTest: AddProfileActivityTest) {
-    component.inject(addProfileActivityTest)
-  }
+    override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
+      return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    }
 
-  override fun createActivityComponent(activity: AppCompatActivity): ActivityComponent {
-    return component.getActivityComponentBuilderProvider().get().setActivity(activity).build()
+    override fun getApplicationInjector(): ApplicationInjector = component
   }
-
-  override fun getApplicationInjector(): ApplicationInjector = component
-}
 }

From 1a9fc269929389c46907dd45b283cf56af8c001c Mon Sep 17 00:00:00 2001
From: Ayush <theayushyadav11@gmail.com>
Date: Fri, 15 Nov 2024 00:09:26 +0530
Subject: [PATCH 5/5] Brought the deleted file back and fixed the code
 structure

---
 .idea/codeStyles/Project.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 2ae2a26048e..66d46e74f0c 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -5,6 +5,8 @@
       <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
     </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <XML>
@@ -159,4 +161,4 @@
       </indentOptions>
     </codeStyleSettings>
   </code_scheme>
-</component>
\ No newline at end of file
+</component>