Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Part of #4938: Introduce Create profile screen #5380

Merged
merged 134 commits into from
Jun 30, 2024
Merged

Fix Part of #4938: Introduce Create profile screen #5380

merged 134 commits into from
Jun 30, 2024

Commits on Mar 27, 2024

  1. Add drawable resources

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    5d86f13 View commit details
    Browse the repository at this point in the history

  2. Make SurveyOnboardingBackgroundView generic for reuse.

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    a17713d View commit details
    Browse the repository at this point in the history

  3. Create app language selection UI

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    7c11bcd View commit details
    Browse the repository at this point in the history

  4. Add tests for the new app language screen

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    722c759 View commit details
    Browse the repository at this point in the history

  5. Fix UI

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    0a24f11 View commit details
    Browse the repository at this point in the history

  6. Fix buildifier issue

    @adhiamboperes
    adhiamboperes committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    1462eb7 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Merge remote-tracking branch 'upstream/new-onboarding-screen' into on… 

    …boarding-profile-type-screen
    @adhiamboperes
    adhiamboperes committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    a337b9b View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2024

  1. Add OnboardingProfileTypeActivity

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    785716e View commit details
    Browse the repository at this point in the history

  2. Add drawable resources

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3067ff2 View commit details
    Browse the repository at this point in the history

  3. Add profile type selection UI with navigation.

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    5a41256 View commit details
    Browse the repository at this point in the history

  4. Add tests

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    40d188f View commit details
    Browse the repository at this point in the history

  5. Add test file exemptions

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    434d9dc View commit details
    Browse the repository at this point in the history

  6. Fix ktlint issue

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    5bd5239 View commit details
    Browse the repository at this point in the history

  7. Addressed general feedback

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    5fb890e View commit details
    Browse the repository at this point in the history

  8. Fix curve background for landscape orientation

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    adbdbed View commit details
    Browse the repository at this point in the history

  9. Flatten Bg drawable

    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    4f0c57b View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' of github.com:oppia/oppia-android into new-onb… 

    …oarding-screen
    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    187726c View commit details
    Browse the repository at this point in the history

  11. Merge remote-tracking branch 'upstream/new-onboarding-screen' into on… 

    …boarding-profile-type-screen

# Conflicts:
#	app/src/main/res/values/component_colors.xml
#	scripts/assets/test_file_exemptions.textproto
    @adhiamboperes
    adhiamboperes committed Apr 3, 2024
    Configuration menu
    Copy the full SHA
    3d2313c View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Merge branch 'onboarding-profile-type-screen' into create-profile-screen

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    352bf33 View commit details
    Browse the repository at this point in the history

  2. Create CreateProfileActivity

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    75c39bc View commit details
    Browse the repository at this point in the history

  3. Create CreateProfileFragment

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    125a408 View commit details
    Browse the repository at this point in the history

  4. Navigate to CreateProfileActivity

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    cf1f68f View commit details
    Browse the repository at this point in the history

  5. Fix ktlint failures

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    eebf64d View commit details
    Browse the repository at this point in the history

  6. Add tests

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    027d912 View commit details
    Browse the repository at this point in the history

  7. Add tests for profile picture upload

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0d7980f View commit details
    Browse the repository at this point in the history

  8. Add layout for tablets

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    312fc38 View commit details
    Browse the repository at this point in the history

  9. Fix self review comments

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    6ccba79 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into new-onboarding-screen

    @adhiamboperes
    adhiamboperes authored Apr 9, 2024
    Configuration menu
    Copy the full SHA
    0bc5547 View commit details
    Browse the repository at this point in the history

  11. Create tablet layouts and darkmode bg

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f31e23d View commit details
    Browse the repository at this point in the history

  12. Merge branch 'new-onboarding-screen' of github.com:oppia/oppia-androi… 

    …d into onboarding-profile-type-screen
    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3e6c7b3 View commit details
    Browse the repository at this point in the history

  13. Fix formatting

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    f1d9092 View commit details
    Browse the repository at this point in the history

  14. Fix failing test

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    3e2166e View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'upstream/onboarding-profile-type-screen… 

    …' into create-profile-screen

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/oppia/android/app/onboardingv2/OnboardingProfileTypeFragmentPresenter.kt
#	app/src/main/res/values-night/color_palette.xml
    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    fc452fc View commit details
    Browse the repository at this point in the history

  16. Fix failing test

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    98fcfe6 View commit details
    Browse the repository at this point in the history

  17. Fix missing bazel declaration for CreateProfileViewModel

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    ccca3a4 View commit details
    Browse the repository at this point in the history

  18. Fix missing bazel declaration for CreateProfileViewModel

    @adhiamboperes
    adhiamboperes committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    5d052e4 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2024

  1. Fix paint style for OppiaCurveBackgroundView.kt

    @adhiamboperes
    adhiamboperes committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    3b4e235 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:oppia/oppia-android into new-onb… 

    …oarding-screen
    @adhiamboperes
    adhiamboperes committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b7935e1 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'new-onboarding-screen' of github.com:oppia/oppia-androi… 

    …d into new-onboarding-screen
    @adhiamboperes
    adhiamboperes committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    b722e49 View commit details
    Browse the repository at this point in the history

  4. Adjust height of the otter drawable

    @adhiamboperes
    adhiamboperes committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    8f7e355 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. Improve styling for phone layouts

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b411179 View commit details
    Browse the repository at this point in the history

  2. Improve styling for tablet layouts

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    bad32c5 View commit details
    Browse the repository at this point in the history

  3. Clean up padding and text size dimensions

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    7345107 View commit details
    Browse the repository at this point in the history

  4. Clean up padding and text size dimensions

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    30b26e0 View commit details
    Browse the repository at this point in the history

  5. Remove space

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    2c10cd2 View commit details
    Browse the repository at this point in the history

  6. Fix failing test

    @adhiamboperes
    adhiamboperes committed May 22, 2024
    Configuration menu
    Copy the full SHA
    3d7cf86 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Merge branch 'new-onboarding-screen' into onboarding-profile-type-screen

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    e67a2f0 View commit details
    Browse the repository at this point in the history

  2. Update styling

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    4f53fb5 View commit details
    Browse the repository at this point in the history

  3. Remove unnecessary tests

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    70fac4a View commit details
    Browse the repository at this point in the history

  4. Fix indentation

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8d5c408 View commit details
    Browse the repository at this point in the history

  5. Fix general review comments

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    73874b8 View commit details
    Browse the repository at this point in the history

  6. Create style for back navigation button

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    9547f8d View commit details
    Browse the repository at this point in the history

  7. Fix mobile landscape layout

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    cd54544 View commit details
    Browse the repository at this point in the history

  8. Fix tests and add tests for mobile landscape layout

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    16c9a97 View commit details
    Browse the repository at this point in the history

  9. Fix ktlint

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0ea7456 View commit details
    Browse the repository at this point in the history

  10. Fix ktlint

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    076c7f0 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'onboarding-profile-type-screen' into create-profile-screen 

    # Conflicts:
#	app/src/main/res/values/styles.xml
#	app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt
    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ca2fbfe View commit details
    Browse the repository at this point in the history

  12. Improve phone layout styling

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    ab2ee84 View commit details
    Browse the repository at this point in the history

  13. Improve tablet layout styling

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    b2bc62d View commit details
    Browse the repository at this point in the history

  14. Fix tests

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    8e5ac97 View commit details
    Browse the repository at this point in the history

  15. Flatten the activity layout

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    827afae View commit details
    Browse the repository at this point in the history

  16. Revert formatting changes in the styles file

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    114ae78 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'develop' of github.com:oppia/oppia-android into new-onb… 

    …oarding-screen
    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    fde105c View commit details
    Browse the repository at this point in the history

  18. Merge branch 'new-onboarding-screen' into onboarding-profile-type-screen

    @adhiamboperes
    adhiamboperes committed May 23, 2024
    Configuration menu
    Copy the full SHA
    01c45af View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. Fix margin and update with develop

    @adhiamboperes
    adhiamboperes committed May 24, 2024
    Configuration menu
    Copy the full SHA
    0bdd447 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/onboarding-profile-type-screen… 

    …' into create-profile-screen
    @adhiamboperes
    adhiamboperes committed May 24, 2024
    Configuration menu
    Copy the full SHA
    1a4ae23 View commit details
    Browse the repository at this point in the history

  3. Fix missing kdoc

    @adhiamboperes
    adhiamboperes committed May 24, 2024
    Configuration menu
    Copy the full SHA
    497d35b View commit details
    Browse the repository at this point in the history

  4. Fix kdoc

    @adhiamboperes
    adhiamboperes committed May 24, 2024
    Configuration menu
    Copy the full SHA
    9dcf007 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Refactor existing OnboardingFragmentPresenter to OnboardingFragmentPr… 

    …esenterV1
    @adhiamboperes
    adhiamboperes committed May 28, 2024
    Configuration menu
    Copy the full SHA
    bbe7221 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. Refactor the dropdown

    @adhiamboperes
    adhiamboperes committed May 31, 2024
    Configuration menu
    Copy the full SHA
    05f598d View commit details
    Browse the repository at this point in the history

  2. Refactor the dropdown in alternate layouts

    @adhiamboperes
    adhiamboperes committed May 31, 2024
    Configuration menu
    Copy the full SHA
    6565d73 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. Refactor custom background to a binding adapter

    @adhiamboperes
    adhiamboperes committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    d67f5ed View commit details
    Browse the repository at this point in the history

  2. Fix failing tests and set up bazel test

    @adhiamboperes
    adhiamboperes committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    7c69c15 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/develop' into new-onboarding-s… 

    …creen

# Conflicts:
#	app/src/sharedTest/java/org/oppia/android/app/databinding/BUILD.bazel
    @adhiamboperes
    adhiamboperes committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    0a7c600 View commit details
    Browse the repository at this point in the history

  4. Fix ktlint

    @adhiamboperes
    adhiamboperes committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    1c0494f View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. Replace otter png with SVG

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    a8c207a View commit details
    Browse the repository at this point in the history

  2. Fix failing tests and general cleanup

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    1172ff6 View commit details
    Browse the repository at this point in the history

  3. Fix test file exemption

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    4612e6b View commit details
    Browse the repository at this point in the history

  4. Fix accessibility label exemption

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    d3451ab View commit details
    Browse the repository at this point in the history

  5. Fix drawable vector hex exemption

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    6095c54 View commit details
    Browse the repository at this point in the history

  6. Fix unused exemption

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    2540989 View commit details
    Browse the repository at this point in the history

  7. Fix failing test

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    65d9f11 View commit details
    Browse the repository at this point in the history

  8. Move files to onboarding package

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    3bf91c3 View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'upstream/new-onboarding-screen' into on… 

    …boarding-profile-type-screen

# Conflicts:
#	app/src/main/java/org/oppia/android/app/activity/ActivityComponentImpl.kt
#	app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragment.kt
#	app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
#	scripts/assets/test_file_exemptions.textproto
    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    18ba375 View commit details
    Browse the repository at this point in the history

  10. Resolve merge conflicts

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    05d05f1 View commit details
    Browse the repository at this point in the history

  11. Added oxford comma

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    1067e57 View commit details
    Browse the repository at this point in the history

  12. Removed leftover exemption

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    e79b69b View commit details
    Browse the repository at this point in the history

  13. Fix tests

    @adhiamboperes
    adhiamboperes committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    c694f51 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Fix static check errors

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    12fbcad View commit details
    Browse the repository at this point in the history

  2. Move everything to onboarding package

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    56f2998 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/onboarding-profile-type-screen… 

    …' into create-profile-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/OnboardingFragment.kt
#	app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
#	app/src/sharedTest/java/org/oppia/android/app/onboarding/OnboardingProfileTypeFragmentTest.kt
    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3fe2539 View commit details
    Browse the repository at this point in the history

  4. Address initial review comments + pull in changes from upstream

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d955011 View commit details
    Browse the repository at this point in the history

  5. Address styling suggestions

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    7286c86 View commit details
    Browse the repository at this point in the history

  6. Add textwatcher to name edittext

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    787c3f1 View commit details
    Browse the repository at this point in the history

  7. Switch to glide util

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    2d895c0 View commit details
    Browse the repository at this point in the history

  8. Add test for image loading

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    26b7f1e View commit details
    Browse the repository at this point in the history

  9. Add test for image loading

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    e39cd19 View commit details
    Browse the repository at this point in the history

  10. Fix script check failures

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c9f4d82 View commit details
    Browse the repository at this point in the history

  11. Fix missing build input

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    c23baab View commit details
    Browse the repository at this point in the history

  12. Fix script check failures

    @adhiamboperes
    adhiamboperes committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    90d56c1 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge remote-tracking branch 'upstream/develop' into new-onboarding-s… 

    …creen

# Conflicts:
#	app/src/main/java/org/oppia/android/app/onboarding/OnboardingFragmentPresenter.kt
    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    f14bbb1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-onboarding-screen' into onboarding-profile-type-screen

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    ea056af View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/onboarding-profile-type-screen… 

    …' into create-profile-screen
    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5237f63 View commit details
    Browse the repository at this point in the history

  4. Fix merge conflict

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3fdf74f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'new-onboarding-screen' into onboarding-profile-type-screen

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    c2c244b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'onboarding-profile-type-screen' into create-profile-screen

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    b802921 View commit details
    Browse the repository at this point in the history

  7. Create new style for error messages

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    a435c11 View commit details
    Browse the repository at this point in the history

  8. Add textwatcher test

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    3f3b810 View commit details
    Browse the repository at this point in the history

  9. Fix small issues

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5b3ecba View commit details
    Browse the repository at this point in the history

  10. Fix small issues

    @adhiamboperes
    adhiamboperes committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5b43705 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. Merge branch 'develop' into new-onboarding-screen

    @adhiamboperes
    adhiamboperes committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    72624f5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'new-onboarding-screen' into onboarding-profile-type-screen

    @adhiamboperes
    adhiamboperes committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    13d9ac5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'onboarding-profile-type-screen' into create-profile-screen

    @adhiamboperes
    adhiamboperes committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    f0d0c57 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. Replace Lifecycle.State check with activity.isFinishing

    @adhiamboperes
    adhiamboperes committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    485dc54 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2024

  1. Flatten layout

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    33624d7 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflicts

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    2b10f80 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'onboarding-profile-type-screen' into create-profile-screen

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    1ade253 View commit details
    Browse the repository at this point in the history

  4. Adjust profile picture prompt

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    49586cc View commit details
    Browse the repository at this point in the history

  5. Add assertions for image loaded

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    2d5d438 View commit details
    Browse the repository at this point in the history

  6. Replace Lifecycle.State check with activity.isFinishing

    @adhiamboperes
    adhiamboperes committed Jun 19, 2024
    Configuration menu
    Copy the full SHA
    41dea0b View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2024

  1. Merge branch 'develop' into onboarding-profile-type-screen 

    # Conflicts:
#	scripts/assets/test_file_exemptions.textproto
    @adhiamboperes
    adhiamboperes committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    1bb7508 View commit details
    Browse the repository at this point in the history

  2. Update test_file_exemptions to the new format

    @adhiamboperes
    adhiamboperes committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    6e0401f View commit details
    Browse the repository at this point in the history

  3. Fix indent

    @adhiamboperes
    adhiamboperes committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    2f84098 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'onboarding-profile-type-screen' into create-profile-screen 

    # Conflicts:
#	scripts/assets/test_file_exemptions.textproto
    @adhiamboperes
    adhiamboperes committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    d979d1b View commit details
    Browse the repository at this point in the history

  5. Update test_file_exemptions

    @adhiamboperes
    adhiamboperes committed Jun 24, 2024
    Configuration menu
    Copy the full SHA
    2d83378 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2024

  1. 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
    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    04acfa9 View commit details
    Browse the repository at this point in the history

  2. Replace png images with svgs

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    223150b View commit details
    Browse the repository at this point in the history

  3. Add exemptions for new svgs

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    90428af View commit details
    Browse the repository at this point in the history

  4. Pull upstream and fix conflicts

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    e248fb1 View commit details
    Browse the repository at this point in the history

  5. Change default avatar bg in v2

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    9fd9fbc View commit details
    Browse the repository at this point in the history

  6. Fix profile prompt background

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    2ec249d View commit details
    Browse the repository at this point in the history

  7. 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
    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    988ab47 View commit details
    Browse the repository at this point in the history

  8. Fix deprecated api

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    af6ed95 View commit details
    Browse the repository at this point in the history

  9. Fix kdoc

    @adhiamboperes
    adhiamboperes committed Jun 30, 2024
    Configuration menu
    Copy the full SHA
    05d02c3 View commit details
    Browse the repository at this point in the history