Fix #4405: Rename EventLogger to AnalyticsEventLogger #4694
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Refactoring this to make it more specific. Also refactore4d some lines to meet ktlint lexicological import order and max line length rules
Update EventLogger.kt to AnalyticsEventLogger.kt following rename.
Update FakeEventLogger.kt to FakeAnalyticsEventLogger.kt
Update DebugEventLogger.kt to DebugAnalyticsEventLogger.kt
Wrap code to next line
…android into rename-event-logger
Updating parameters and fields to capture context
AnalyticsEventLogger is an interface so it does not have tests. This change is needed due to the rename of the EventLogger file.
This change is needed due to the rename of the FirebaseEventLogger file.
This change is needed due to the rename of the FirebaseEventLogger file.
|
PTAL @BenHenning, the PR is ready |
BenHenning
requested changes
Nov 9, 2022
There was a problem hiding this comment.
Thanks @adhiamboperes! This is well done. I just had two comments--PTAL.
...java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
Outdated
Show resolved
Hide resolved
domain/src/test/java/org/oppia/android/domain/oppialogger/loguploader/LogUploadWorkerTest.kt
Outdated
Show resolved
Hide resolved
Retain the changes related to max line exceeded rules though
|
PTAL @BenHenning, I have removed the format-only changes in LogUploadWorkerTest. |
BenHenning
reviewed
Nov 10, 2022
...java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
Outdated
Show resolved
Hide resolved
…a#4656) <!-- READ ME FIRST: Please fill in the explanation section below and check off every point from the Essential Checklist! --> ## Explanation Fixes [oppia#3746](oppia#3746) This PR bans all usage of the <include...> tag in XML layout files that reference it. It does so by adding a check block inside the file_content_validation_checks text proto script file. This pr also removes the toolbar.xml file, since its no longer being used. <!-- - 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. --> ## 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)) - Add a screenshot demonstrating that you ran affected Espresso tests locally & that they're passing ## SCREENSHOT FOR THE REGEX PATTERN CHECKS FAILED  ## SCREENSHOT FOR THE REGEX PATTERN CHECKS PASSED  ## A LIST OF THE FILES THAT HAVE THE <INCLUDE.../> TAG - app/src/main/res/layout/add_profile_activity.xml - addprofileactivity - app/src/main/res/layout/administrator_controls_activity.xml:15: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/help_without_drawer_activity.xml:11: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/option_activity.xml:13: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/options_without_drawer_activity.xml:11: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/developer_options_activity.xml:15: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/home_activity.xml:14: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/help_activity.xml:13: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout/profile_progress_activity.xml:9: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout-sw600dp/administrator_controls_activity.xml:15: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout-sw600dp/option_activity.xml:13: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout-sw600dp/options_without_drawer_activity.xml:12: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead - app/src/main/res/layout-sw600dp/help_activity.xml:13: Remove <include .../> tag from layout and use the appropriate widget, e.g like AppBarLayout widget instead Co-authored-by: MAZAKPE <makpalyy@gmail.com> Co-authored-by: Ben Henning <ben@oppia.org>
## Explanation Fixes oppia#4701: Improved accessibility for congratulations text by changing height to wrap_content and improved contrast ratio by changing color in color pallet. ## 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)). ## Screenshot Before | After :-------------------------:|:-------------------------:  | 
Translation updates Co-authored-by: Ben Henning <ben@oppia.org>
…android into rename-event-logger
adhiamboperes
commented
Nov 10, 2022
There was a problem hiding this comment.
Thanks for clarifying @BenHenning! I hadn't noticed this before. PTAL again.
...java/org/oppia/android/domain/oppialogger/loguploader/LogReportWorkManagerInitializerTest.kt
Outdated
Show resolved
Hide resolved
Actually I have noticed that there are some unrelated commits on this branch, not sure how I got them mixed up. Is there a provision for me to rebase-drop these? Alternatively I may have to create a new branch and cherry-pick the relevant commits😟
|
|
Unassigning @adhiamboperes since a re-review was requested. @adhiamboperes, please make sure you have addressed all review comments. Thanks! |
BenHenning
approved these changes
Nov 12, 2022
|
Unassigning @BenHenning since they have already approved the PR. |
|
Assigning @rt4914 for code owner reviews. Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
Fixes #4405:
Refactoring EventLogger to AnalyticsEventLogger to make it more specific, in line with refactoring other event loggers.
Changes to:
Did not make changes to the following, given they are already pretty specific:
Refactored
scripts/assets/test_file_exemptions.textprototo update the new path ofDebugAnalyticsEventLogger,FirebaseAnalyticsEventLoggerandAnalyticsEventLoggerto exempt them from corresponding file checks.Refactored
file_content_validation_checks.textprototo exemptFirebaseAnalyticsEventLoggerfrom prohibited Locale use check.Essential Checklist