Fix Part of #4938: Profile Configuration and Migration #5387
Commits on Jun 4, 2024
-
-
-
-
-
-
-
-
-
-
Merge remote-tracking branch 'upstream/create-profile-screen' into on…
…boarding-learner-intro-screen # Conflicts: # 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/CreateProfileFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt # app/src/main/res/values/styles.xml # app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt # scripts/assets/test_file_exemptions.textproto
Commits on Jun 5, 2024
-
-
-
-
-
-
-
-
Merge remote-tracking branch 'upstream/onboarding-learner-intro-scree…
…n' into onboarding-audio-language-screen # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileActivity.kt # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileActivityPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileFragment.kt # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/IntroActivity.kt # app/src/main/java/org/oppia/android/app/onboarding/IntroActivityPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/IntroFragment.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivity.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeActivityPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragment.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentPresenter.kt # app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt # scripts/assets/test_file_exemptions.textproto
-
-
Commits on Jun 11, 2024
-
Merge remote-tracking branch 'upstream/develop' into new-onboarding-s…
…creen # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
-
Merge remote-tracking branch 'upstream/onboarding-profile-type-screen…
…' into create-profile-screen
-
-
-
-
-
-
Merge branch 'create-profile-screen' into onboarding-learner-intro-sc…
…reen # Conflicts: # app/src/main/res/values/styles.xml # app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt
-
-
Merge remote-tracking branch 'upstream/onboarding-learner-intro-scree…
…n' into onboarding-audio-language-screen
Commits on Jun 13, 2024
-
Merge branch 'onboarding-audio-language-screen' into onboarding-profi…
…le-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/options/AudioLanguageFragment.kt # app/src/main/java/org/oppia/android/app/splash/SplashActivityPresenter.kt
-
-
-
-
-
Commits on Jun 17, 2024
-
-
-
-
-
-
-
Merge branch 'onboarding-audio-language-screen' into onboarding-profi…
…le-domain-config # Conflicts: # model/src/main/proto/oppia_logger.proto # testing/src/main/java/org/oppia/android/testing/logging/EventLogSubject.kt # utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
Commits on Jun 18, 2024
Commits on Jun 19, 2024
-
-
-
-
-
-
-
Merge branch 'create-profile-screen' into onboarding-learner-intro-sc…
…reen # Conflicts: # app/src/sharedTest/java/org/oppia/android/app/onboarding/CreateProfileFragmentTest.kt
-
-
-
-
Merge branch 'onboarding-audio-language-screen' into onboarding-profi…
…le-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/IntroFragment.kt
-
-
Commits on Jun 21, 2024
Commits on Jun 22, 2024
Commits on Jun 24, 2024
-
-
-
-
-
-
-
Merge branch 'develop' into onboarding-profile-type-screen
# Conflicts: # scripts/assets/test_file_exemptions.textproto
-
-
-
Merge branch 'onboarding-profile-type-screen' into create-profile-screen
# Conflicts: # scripts/assets/test_file_exemptions.textproto
-
-
Merge branch 'create-profile-screen' into onboarding-learner-intro-sc…
…reen # Conflicts: # model/src/main/proto/arguments.proto # scripts/assets/test_file_exemptions.textproto
-
-
Merge branch 'onboarding-learner-intro-screen' into onboarding-audio-…
…language-screen # Conflicts: # scripts/assets/test_file_exemptions.textproto
Commits on Jun 25, 2024
-
-
-
Merge branch 'onboarding-audio-language-screen' into onboarding-profi…
…le-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/home/HomeActivity.kt # app/src/main/java/org/oppia/android/app/home/HomeFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/AudioLanguageFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/testing/NavigationDrawerTestActivity.kt # app/src/test/java/org/oppia/android/app/home/HomeActivityLocalTest.kt # scripts/assets/test_file_exemptions.textproto
-
-
-
Commits on Jun 26, 2024
Commits on Jun 30, 2024
-
Merge branch 'develop' into onboarding-profile-type-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/res/values-night/color_palette.xml # app/src/main/res/values/color_defs.xml # app/src/main/res/values/color_palette.xml # app/src/main/res/values/component_colors.xml # model/src/main/proto/screens.proto # utility/src/main/java/org/oppia/android/util/logging/EventBundleCreator.kt
-
-
-
-
-
-
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
-
-
Merge branch 'create-profile-screen' into onboarding-learner-intro-sc…
…reen # Conflicts: # app/src/main/res/values/color_defs.xml # app/src/main/res/values/color_palette.xml # model/src/main/proto/screens.proto
-
-
Merge remote-tracking branch 'upstream/onboarding-learner-intro-scree…
…n' into onboarding-audio-language-screen
-
Commits on Jul 1, 2024
-
Merge branch 'develop' into onboarding-audio-language-screen
# Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/IntroFragmentPresenter.kt # app/src/main/res/values/styles.xml # scripts/assets/test_file_exemptions.textproto
-
-
-
Commits on Jul 3, 2024
-
Pass the created profileId and update profile details
Pass the OnboardingFragmentPresenter through intents and bundles Added a new function to update multiple profile details at once.
-
Refactored IntroFragment arguments to proto, and decorated with the p…
…rofileId Passing the profileId to AudioLanguageActivity eliminates the need to fetch it, when required for audio language operations.
-
Prime AudioLanguageActivity to receive a profileId args
Also, remove instances of non-null assertion on internal profileId
-
-
-
Commits on Jul 5, 2024
Commits on Jul 11, 2024
-
Update profile error message view
Use an observable field to dynamically update errors.
-
Refactor IntroActivity intent creation
Pass extras creation to the calling method
-
-
-
-
-
-
-
-
Add tests for language selection
Tests for locale, config change, selections and default selection.
-
Commits on Jul 12, 2024
-
-
-
-
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/IntroActivity.kt # app/src/main/java/org/oppia/android/app/onboarding/IntroActivityPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/IntroFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/options/AudioLanguageActivity.kt # app/src/main/java/org/oppia/android/app/options/AudioLanguageActivityPresenter.kt # app/src/main/java/org/oppia/android/app/options/AudioLanguageFragment.kt # app/src/main/java/org/oppia/android/app/translation/AppLanguageResourceHandler.kt # app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt # app/src/sharedTest/java/org/oppia/android/app/options/AudioLanguageFragmentTest.kt # app/src/sharedTest/java/org/oppia/android/app/options/OptionsFragmentTest.kt # domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt # domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt # model/src/main/proto/oppia_logger.proto # model/src/main/proto/profile.proto # scripts/assets/test_file_exemptions.textproto
Commits on Jul 15, 2024
-
-
Complete the sole learner onboarding flow
Make sure all expected events are logged, plus tests.
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt # domain/src/test/java/org/oppia/android/domain/profile/ProfileManagementControllerTest.kt
-
-
Commits on Jul 18, 2024
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/home/HomeActivity.kt # app/src/sharedTest/java/org/oppia/android/app/onboarding/IntroFragmentTest.kt
-
Commits on Jul 23, 2024
Commits on Jul 25, 2024
Commits on Aug 1, 2024
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/AudioLanguageFragmentPresenter.kt
-
-
Merge branch 'onboarding-language-domain-config' of github.com:oppia/…
…oppia-android into onboarding-language-domain-config
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
Commits on Aug 5, 2024
-
-
-
Merge branch 'develop' of github.com:oppia/oppia-android into onboard…
…ing-language-domain-config
-
-
-
Commits on Aug 6, 2024
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
Commits on Aug 14, 2024
Commits on Aug 19, 2024
Commits on Aug 22, 2024
-
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # app/src/main/java/org/oppia/android/app/onboarding/AudioLanguageFragmentPresenter.kt # app/src/main/java/org/oppia/android/app/onboarding/CreateProfileActivityPresenter.kt
Commits on Aug 23, 2024
-
Merge branch 'develop' into onboarding-language-domain-config
# Conflicts: # app/src/main/java/org/oppia/android/app/player/audio/AudioFragmentPresenter.kt
-
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config # Conflicts: # domain/src/main/java/org/oppia/android/domain/profile/ProfileManagementController.kt # scripts/assets/test_file_exemptions.textproto
-
-
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
-
Commits on Aug 24, 2024
Commits on Aug 27, 2024
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
-
-
-
-
Commits on Aug 28, 2024
Commits on Sep 4, 2024
Commits on Sep 9, 2024
-
-
-
-
-
Merge branch 'develop' of github.com:oppia/oppia-android into onboard…
…ing-language-domain-config
-
Commits on Sep 10, 2024
-
-
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
-
-
-
Merge branch 'onboarding-profile-domain-config' of github.com:oppia/o…
…ppia-android into onboarding-profile-domain-config
-
Commits on Sep 11, 2024
-
-
Merge branch 'develop' of github.com:oppia/oppia-android into onboard…
…ing-language-domain-config
-
Commits on Sep 12, 2024
Commits on Sep 16, 2024
Commits on Oct 1, 2024
-
-
Merge branch 'onboarding-language-domain-config' of github.com:oppia/…
…oppia-android into onboarding-language-domain-config
Commits on Oct 4, 2024
-
Merge branch 'onboarding-language-domain-config' into onboarding-prof…
…ile-domain-config
Commits on Oct 9, 2024
Commits on Oct 15, 2024
-
Merge branch 'develop' of github.com:oppia/oppia-android into onboard…
…ing-profile-domain-config
-
Commits on Oct 16, 2024
Commits on Nov 4, 2024
-
Merge branch 'develop' of github.com:oppia/oppia-android into onboard…
…ing-profile-domain-config