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

Show file tree
Hide file tree
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
Nit changes
  • Loading branch information
Rajat Talesra committed Oct 7, 2019
commit 06f03b9679d2afc30ae846df452c7c27d8897f00
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/app/topic/questionplayer/QuestionPlayerActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import org.oppia.app.activity.InjectableAppCompatActivity
import org.oppia.app.topic.TopicActivity
import javax.inject.Inject

const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY = "QuestionPlayerActivity.skill_id_list"
Expand All @@ -22,7 +21,7 @@ class QuestionPlayerActivity : InjectableAppCompatActivity() {

companion object {
// TODO(#159): Use this skillList from TopicTrainFragment to fetch questions and start train mode.
/** Returns a new [Intent] to route to [TopicActivity] for a specified skill ID list. */
/** Returns a new [Intent] to route to [QuestionPlayerActivity] for a specified skill ID list. */
fun createQuestionPlayerActivityIntent(context: Context, skillIdList: ArrayList<String>): Intent {
val intent = Intent(context, QuestionPlayerActivity::class.java)
intent.putExtra(QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY, skillIdList)
Expand Down
1 change: 0 additions & 1 deletion app/src/main/java/org/oppia/app/topic/train/SkillSelectionAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.oppia.app.topic.train

import android.util.Log
import android.view.LayoutInflater
import android.view.ViewGroup
import androidx.databinding.DataBindingUtil
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/java/org/oppia/app/topic/train/TopicTrainViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.oppia.app.topic.train

import android.util.Log
import android.view.View
import androidx.databinding.ObservableField
import androidx.lifecycle.ViewModel
Expand All @@ -16,7 +15,6 @@ class TopicTrainViewModel @Inject constructor(
var isSubmitButtonActive = ObservableField<Boolean>(false)

fun selectedSkillList(selectedSkillList: ArrayList<String>) {
rt4914 marked this conversation as resolved.
Show resolved Hide resolved
Log.d("TAG", "Size: "+selectedSkillList.size)
isSubmitButtonActive.set(selectedSkillList.isNotEmpty())
}

Expand Down