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 #138: Topic train fragment Low-fi UI (Part 3) #203

Merged
merged 19 commits into from
Oct 8, 2019
Merged

Fix part of #138: Topic train fragment Low-fi UI (Part 3) #203

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
8cdfb33
All xml files for topic-train except layout folder
Oct 3, 2019
afd8196
Skill item related files
Oct 3, 2019
87977ab
TopicTrainFragment implementation
Oct 3, 2019
d21f52b
Introduce QuestionPlayer Activity/Fragment
Oct 4, 2019
e39fa93
Domain layer code integration
Oct 5, 2019
1cd605f
Start button activated
Oct 5, 2019
e30e58a
Start button activated
Oct 5, 2019
b1cef82
Separate ViewModel for item
Oct 5, 2019
23e4d27
Managing configuration changes
Oct 5, 2019
7fe1f87
Checkbox state save
Oct 5, 2019
3d0315a
Nit changes
Oct 5, 2019
6c5387f
Fixing HomeActivityController
Oct 6, 2019
5b2dc90
Managing configuration change in checkboxes
Oct 6, 2019
b9b9683
Proper route to QuestionPlayer
Oct 6, 2019
6321130
Nit changes
Oct 6, 2019
06f03b9
Nit changes
Oct 7, 2019
dcdb082
Resolve merge conflicts
Oct 7, 2019
2067b75
Changes as per review
Oct 8, 2019
245309b
Resolve merge conflicts
Oct 8, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Resolve merge conflicts
  • Loading branch information
Rajat Talesra committed Oct 7, 2019
commit dcdb0827840fa4958b8f0d9a4b096df9d51f6627
4 changes: 3 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@
<activity android:name=".player.exploration.ExplorationActivity"/>
<activity android:name=".topic.questionplayer.QuestionPlayerActivity"/>
<activity android:name=".topic.TopicActivity"/>
<activity android:name=".home.HomeActivity">

<activity android:name="org.oppia.app.player.state.testing.StateFragmentTestActivity"/>
<activity android:name="org.oppia.app.home.HomeActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.