Merge branch 'develop' into create-profile-screen

# Conflicts: # app/src/main/AndroidManifest.xml # app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt # app/src/main/java/org/oppia/android/app/fragment/FragmentComponentImpl.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentPresenter.kt # app/src/main/res/values-night/color_palette.xml # app/src/main/res/values/color_palette.xml # app/src/main/res/values/component_colors.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt # model/src/main/proto/screens.proto # scripts/assets/test_file_exemptions.textproto # utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
oppia · Jun 30, 2024 · 988ab47 · 988ab47
2 parents 2ec249d + b278b5e
commit 988ab47
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentPresenter.kt b/app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentPresenter.kt
@@ -23,6 +23,7 @@ class OnboardingProfileTypeFragmentPresenter @Inject constructor(
       container,
       /* attachToRoot= */ false
     )
+
     binding.apply {
       lifecycleOwner = fragment
 

diff --git a/...src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt b/...src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt
@@ -86,6 +86,7 @@ import org.oppia.android.util.caching.AssetModule
 import org.oppia.android.util.caching.testing.CachingTestModule
 import org.oppia.android.util.gcsresource.GcsResourceModule
 import org.oppia.android.util.locale.LocaleProdModule
+import org.oppia.android.util.locale.OppiaLocale
 import org.oppia.android.util.logging.EventLoggingConfigurationModule
 import org.oppia.android.util.logging.LoggerModule
 import org.oppia.android.util.logging.SyncStatusModule
@@ -122,6 +123,9 @@ class OnboardingProfileTypeFragmentTest {
   @Inject
   lateinit var context: Context
 
+  @Inject
+  lateinit var machineLocale: OppiaLocale.MachineLocale
+
   @Before
   fun setUp() {
     Intents.init()