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

Topic issues fix #279

Closed
wants to merge 30 commits into from
Closed

Topic issues fix #279

wants to merge 30 commits into from

Conversation

nikitamarysolomanpvt
Copy link
Contributor

Explanation

TODO #135 fixed with test case

Mock

https://xd.adobe.com/spec/e2239cf4-9cde-4c08-5296-25316c1f0a14-9412/screen/0fad68f5-5ca4-4947-b8db-b4cf07235fd7/Topic-w-o-Play-19
To test this app, follow these steps:

  1. In AndroidManifest file make TopicActivity as launcher activity.

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 assigned to an appropriate reviewer.

@nikitamarysolomanpvt
multiple tabs
e2ed1c4
@nikitamarysolomanpvt
Merge branch 'develop' of https://github.com/oppia/oppia-android into…
089ea5a 
… topic-player-multiple-tabs

# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/styles.xml
@nikitamarysolomanpvt
nit changes
43016b6
@nikitamarysolomanpvt
nit changes
3a1a350
@nikitamarysolomanpvt
nit changes
405a45e
@nikitamarysolomanpvt
nit changes
72c7360
@nikitamarysolomanpvt
nit changes
c5ffa61
@nikitamarysolomanpvt
nit changes
47e2efc
@nikitamarysolomanpvt
nit changes
b4ed9bb
@nikitamarysolomanpvt
nit changes
9dd39b9
@nikitamarysolomanpvt
nit changes
b2fca59
@nikitamarysolomanpvt
cust_args
f0cb60f
@nikitamarysolomanpvt
multiple tabs will getting topic id from home
2d21695 
Merge branch 'develop' of https://github.com/oppia/oppia-android into topic-player-multiple-tabs

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
#	domain/src/main/java/org/oppia/domain/exploration/ExplorationRetriever.kt
@nikitamarysolomanpvt
test cases,multiple tabs will getting topic id from home
93b889b 
Merge branch 'develop' of https://github.com/oppia/oppia-android into topic-player-multiple-tabs

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
#	domain/src/main/java/org/oppia/domain/exploration/ExplorationRetriever.kt
@nikitamarysolomanpvt
nit
3130323
@nikitamarysolomanpvt
nit
bbe7cf3
@nikitamarysolomanpvt
nit
046e297
@nikitamarysolomanpvt
nit
ba506ab
@nikitamarysolomanpvt
nit
6f228d1
@nikitamarysolomanpvt
separate test cases for all four tabs
24be11b
@nikitamarysolomanpvt
nit
bfa2b78
@nikitamarysolomanpvt
nit
0c6d5d8
@nikitamarysolomanpvt
nit
f8f84f1
@nikitamarysolomanpvt
nit
efae9f7
@nikitamarysolomanpvt
nit
1ecfc2f
@nikitamarysolomanpvt
nit
293aa52
@nikitamarysolomanpvt
nit
949f89e
@nikitamarysolomanpvt
nit
71ae233
@nikitamarysolomanpvt
Topic Overview see more click and tab switch
8197cc3
@nikitamarysolomanpvt nikitamarysolomanpvt changed the base branch from develop to topic-player-multiple-tabs October 31, 2019 05:04
@nikitamarysolomanpvt nikitamarysolomanpvt changed the base branch from topic-player-multiple-tabs to develop October 31, 2019 07:07
@nikitamarysolomanpvt nikitamarysolomanpvt mentioned this pull request Oct 31, 2019
Merged
6 tasks
@nikitamarysolomanpvt
Copy link
Contributor Author

Duplicate of #285 so closing.

@nikitamarysolomanpvt nikitamarysolomanpvt deleted the topic_issues_fix branch November 6, 2019 05:29
This was referenced Nov 7, 2019
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@veena14cs veena14cs veena14cs left review comments

@rt4914 rt4914 Awaiting requested review from rt4914

Assignees

@nikitamarysolomanpvt nikitamarysolomanpvt

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nikitamarysolomanpvt @veena14cs @rt4914