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 #1420 : Event logging in Profile and Tests in app module #1422

Merged
merged 15 commits into from
Jul 2, 2020
Merged

Fix #1420 : Event logging in Profile and Tests in app module #1422

merged 15 commits into from
Jul 2, 2020

Conversation

Sarthak2601
Copy link
Contributor

@Sarthak2601 Sarthak2601 commented Jun 28, 2020 •
edited
Loading

Explanation

Fix #1420

  • Addition of event logging in profile. [verified from firebase console]
  • Addition of following test files for Home, Info (topic), Lessons (topic), Story, Exploration and Revision Card.

Checklist

  • The PR title starts with "Fix #bugnum: ", followed by a short, clear summary of the changes. (If this PR fixes part of an issue, prefix the title with "Fix part of #bugnum: ...".)
  • The PR explanation includes the words "Fixes #bugnum: ..." (or "Fixes part of #bugnum" if the PR only partially fixes an issue).
  • The PR follows the style guide.
  • The PR does not contain any unnecessary auto-generated code from Android Studio.
  • The PR is made from a branch that's not called "develop".
  • The PR is made from a branch that is up-to-date with "develop".
  • The PR's branch is based on "develop" and not on any other branch.
  • The PR is assigned to an appropriate reviewer in both the Assignees and the Reviewers sections.

vinitamurthi
vinitamurthi suggested changes Jun 29, 2020
View reviewed changes
Copy link
Contributor

@vinitamurthi vinitamurthi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mainly nits of formatting but otherwise looks good

app/src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt Outdated Show resolved Hide resolved
model/src/main/proto/event_logger.proto Outdated Show resolved Hide resolved
anandwana001
anandwana001 suggested changes Jun 29, 2020
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just these few else Good to go.

app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt Outdated Show resolved Hide resolved
@anandwana001 anandwana001 removed their assignment Jun 29, 2020
anandwana001
anandwana001 suggested changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit changes.
Just an important point, we are using ktlint version 0.37 or above. So, you can use the same on your local too.

app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/main/java/org/oppia/app/topic/TopicFragmentPresenter.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/profile/ProfileChooserFragmentLocalTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/story/StoryActivityLocalTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/topic/info/TopicInfoFragmentLocalTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/topic/lessons/TopicLessonsFragmentLocalTest.kt Outdated Show resolved Hide resolved
app/src/test/java/org/oppia/app/topic/revisioncard/RevisionCardActivityLocalTest.kt Outdated Show resolved Hide resolved
vinitamurthi
vinitamurthi suggested changes Jul 1, 2020
View reviewed changes
Copy link
Contributor

@vinitamurthi vinitamurthi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are many lint errors, please run ktlint --android -F <path_to_file>.kt , organize imports, and reformat code for all your PRs to avoid the back and forth of reviewers pointing out linting errors

app/src/main/java/org/oppia/app/profile/ProfileChooserFragmentPresenter.kt Outdated Show resolved Hide resolved
@vinitamurthi vinitamurthi removed their assignment Jul 1, 2020
@Sarthak2601
Merge branch 'develop' into tests-app-profile-log
f85b26b 
# Conflicts:
#	app/src/main/java/org/oppia/app/topic/lessons/TopicLessonsFragmentPresenter.kt
#	app/src/main/java/org/oppia/app/topic/practice/TopicPracticeFragmentPresenter.kt
#	app/src/main/java/org/oppia/app/topic/revision/TopicRevisionFragmentPresenter.kt
@Sarthak2601
fixes.
56e41dc
@Sarthak2601
test fixes.
54e3ac3
@Sarthak2601
Copy link
Contributor Author

Sarthak2601 commented Jul 1, 2020 •
edited
Loading

nit changes.
Just an important point, we are using ktlint version 0.37 or above. So, you can use the same on your local too.

Done with the changes. Thanks @vinitamurthi and @anandwana001 for the pointers. I think they will be fine now as I ran the ktlint command on all my files and yes per Akshay's suggestion created a macro for future use as well :)

anandwana001
anandwana001 approved these changes Jul 2, 2020
View reviewed changes
Copy link
Contributor

@anandwana001 anandwana001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, as now we have app module ktlint check over GitHub action.

@anandwana001 anandwana001 removed their assignment Jul 2, 2020
@Sarthak2601
Copy link
Contributor Author

Approval done, comments resolved and checks passed. Merging now!

@Sarthak2601 Sarthak2601 merged commit a1b329c into develop Jul 2, 2020
@Sarthak2601 Sarthak2601 deleted the tests-app-profile-log branch July 2, 2020 13:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@anandwana001 anandwana001 anandwana001 approved these changes

@vinitamurthi vinitamurthi vinitamurthi approved these changes

Assignees

@Sarthak2601 Sarthak2601

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Addition of event logging and tests in app module.
3 participants
@Sarthak2601 @vinitamurthi @anandwana001