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.

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

Develop (fork) Branch Update #6

Merged
merged 2 commits into from
Sep 27, 2024
Merged

Commits on Sep 17, 2024

  1. Fix #3842: Remove second/millisecond conversion check for greeting ti…

    …mestamp (#5536)
    
    <!-- READ ME FIRST: Please fill in the explanation section below and
    check off every point from the Essential Checklist! -->
    ## Explanation
    <!--
    - Explain what your PR does. If this PR fixes an existing bug, please
    include
    - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
    issue
      - when this PR is merged.
      -->
    Fixes #3842 
    
    This PR removes the `ensureTimestampIsInMilliseconds` function from
    `TextViewBindingAdapters`, eliminating the need for the
    second-to-millisecond conversion check for greeting timestamps.
    
    ### Sreenshots
    |Before|After|
    |--|--|
    |![WhatsApp Image 2024-09-17 at 11 36 52
    AM](https://github.com/user-attachments/assets/0978ffe5-9457-4071-8828-a2791e7e4664)|![WhatsApp
    Image 2024-09-17 at 11 39 41
    AM](https://github.com/user-attachments/assets/5c41cdc1-5287-4979-8969-4057362434c9)|
    ## Essential Checklist
    <!-- Please tick the relevant boxes by putting an "x" in them. -->
    - [x] The PR title and explanation each start with "Fix #bugnum: " (If
    this PR fixes part of an issue, prefix the title with "Fix part of
    #bugnum: ...".)
    - [x] Any changes to
    [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
    files have their rationale included in the PR explanation.
    - [x] The PR follows the [style
    guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
    - [x] The PR does not contain any unnecessary code changes from Android
    Studio
    ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
    - [x] The PR is made from a branch that's **not** called "develop" and
    is up-to-date with "develop".
    - [x] The PR is **assigned** to the appropriate reviewers
    ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
    
    ## For UI-specific PRs only
    <!-- Delete these section if this PR does not include UI-related
    changes. -->
    If your PR includes UI-related changes, then:
    - Add screenshots for portrait/landscape for both a tablet & phone of
    the before & after UI changes
    - For the screenshots above, include both English and pseudo-localized
    (RTL) screenshots (see [RTL
    guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
    - Add a video showing the full UX flow with a screen reader enabled (see
    [accessibility
    guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
    - For PRs introducing new UI elements or color changes, both light and
    dark mode screenshots must be included
    - Add a screenshot demonstrating that you ran affected Espresso tests
    locally & that they're passing
    dattasneha authored Sep 17, 2024
    Configuration menu
    Copy the full SHA
    dfb9a30 View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Fix part of #5404: Migrate away from onBackPressed (#5521)

    <!-- READ ME FIRST: Please fill in the explanation section below and
    check off every point from the Essential Checklist! -->
    
    ## Explanation
    <!-- 
    - Explain what your PR does. If this PR fixes an existing bug, please
    include
    - "Fixes #bugnum:" in the explanation so that GitHub can auto-close the
    issue
      - when this PR is merged.
      -->
    Fixes part of #5404 
    
    This PR migrates deprecated `onBackPressed` usage to
    `OnBackPressedDispatcher` callback in the following activities and
    presenters.
    
    - AdministratorControlsActivity
    - AppVersionActivity
    - ProfileAndDeviceIdActivity
    - MarkChaptersCompletedActivity
    - MarkStoriesCompletedActivity
    - MarkTopicsCompletedActivity
    - ReadingTextSizeActivityPresenter
    - ExplorationActivityPresenter
    - ResumeLessonActivityPresenter
    
    
    ## Essential Checklist
    <!-- Please tick the relevant boxes by putting an "x" in them. -->
    - [x] The PR title and explanation each start with "Fix #bugnum: " (If
    this PR fixes part of an issue, prefix the title with "Fix part of
    #bugnum: ...".)
    - [x] Any changes to
    [scripts/assets](https://github.com/oppia/oppia-android/tree/develop/scripts/assets)
    files have their rationale included in the PR explanation.
    - [x] The PR follows the [style
    guide](https://github.com/oppia/oppia-android/wiki/Coding-style-guide).
    - [x] The PR does not contain any unnecessary code changes from Android
    Studio
    ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#undo-unnecessary-changes)).
    - [x] The PR is made from a branch that's **not** called "develop" and
    is up-to-date with "develop".
    - [x] The PR is **assigned** to the appropriate reviewers
    ([reference](https://github.com/oppia/oppia-android/wiki/Guidance-on-submitting-a-PR#clarification-regarding-assignees-and-reviewers-section)).
    
    ## For UI-specific PRs only
    <!-- Delete these section if this PR does not include UI-related
    changes. -->
    If your PR includes UI-related changes, then:
    - Add screenshots for portrait/landscape for both a tablet & phone of
    the before & after UI changes
    - For the screenshots above, include both English and pseudo-localized
    (RTL) screenshots (see [RTL
    guide](https://github.com/oppia/oppia-android/wiki/RTL-Guidelines))
    - Add a video showing the full UX flow with a screen reader enabled (see
    [accessibility
    guide](https://github.com/oppia/oppia-android/wiki/Accessibility-A11y-Guide))
    - For PRs introducing new UI elements or color changes, both light and
    dark mode screenshots must be included
    - Add a screenshot demonstrating that you ran affected Espresso tests
    locally & that they're passing
    
    ---------
    
    Co-authored-by: Adhiambo Peres <[email protected]>
    dattasneha and adhiamboperes authored Sep 19, 2024
    Configuration menu
    Copy the full SHA
    8d44bf7 View commit details
    Browse the repository at this point in the history