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.

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

Fix #568: @Inject related reformatting issues #570

Merged
merged 5 commits into from
Dec 23, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/app/home/HomeActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import javax.inject.Inject

/** The central activity for all users entering the app. */
class HomeActivity : InjectableAppCompatActivity(), RouteToTopicListener {
@Inject
lateinit var homeActivityPresenter: HomeActivityPresenter
@Inject lateinit var homeActivityPresenter: HomeActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import javax.inject.Inject

/** Fragment that controls audio for a content-card. */
class AudioFragment : InjectableFragment(), LanguageInterface, AudioUiManager, CellularDataInterface {
@Inject
lateinit var audioFragmentPresenter: AudioFragmentPresenter
@Inject lateinit var audioFragmentPresenter: AudioFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ private const val TAG_STOP_EXPLORATION_DIALOG = "STOP_EXPLORATION_DIALOG"

/** The starting point for exploration. */
class ExplorationActivity : InjectableAppCompatActivity(), StopExplorationInterface, StateKeyboardButtonListener, AudioButtonListener {
@Inject
lateinit var explorationActivityPresenter: ExplorationActivityPresenter
@Inject lateinit var explorationActivityPresenter: ExplorationActivityPresenter
private lateinit var explorationId: String
private var topicId: String? = null

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ class SelectionInteractionView @JvmOverloads constructor(
// Default to checkboxes to ensure that something can render even if it may not be correct.
private var selectionItemInputType: SelectionItemInputType = SelectionItemInputType.CHECKBOXES

@Inject
lateinit var htmlParserFactory: HtmlParser.Factory
@Inject lateinit var htmlParserFactory: HtmlParser.Factory

@Inject
@field:ExplorationHtmlParserEntityType
lateinit var entityType: String
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ class StateFragment : InjectableFragment(), InteractionAnswerReceiver {
}
}

@Inject
lateinit var stateFragmentPresenter: StateFragmentPresenter
@Inject lateinit var stateFragmentPresenter: StateFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const val KEY_ADD_PROFILE_COLOR_RGB = "KEY_ADD_PROFILE_COLOR_RGB"

/** Activity that allows users to create new profiles. */
class AddProfileActivity : InjectableAppCompatActivity() {
@Inject
lateinit var addProfileFragmentPresenter: AddProfileActivityPresenter
@Inject lateinit var addProfileFragmentPresenter: AddProfileActivityPresenter

companion object {
fun createAddProfileActivityIntent(context: Context, colorRgb: Int): Intent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const val KEY_ADMIN_AUTH_COLOR_RGB = "ADMIN_AUTH_COLOR_RGB"

/** Activity that authenticates by checking for admin's PIN. */
class AdminAuthActivity : InjectableAppCompatActivity() {
@Inject
lateinit var adminAuthFragmentPresenter: AdminAuthActivityPresenter
@Inject lateinit var adminAuthFragmentPresenter: AdminAuthActivityPresenter

companion object {
fun createAdminAuthActivityIntent(context: Context, adminPin: String, colorRgb: Int): Intent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ const val KEY_ADMIN_PIN_COLOR_RGB = "ADMIN_PIN_COLOR_RGB"

/** Activity that sets the admin's PIN. */
class AdminPinActivity : InjectableAppCompatActivity() {
@Inject
lateinit var adminPinActivityPresenter: AdminPinActivityPresenter
@Inject lateinit var adminPinActivityPresenter: AdminPinActivityPresenter

companion object {
fun createAdminPinActivityIntent(context: Context, profileId: Int, colorRgb: Int): Intent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import javax.inject.Inject

/** Activity that controls profile creation and selection. */
class ProfileActivity : InjectableAppCompatActivity() {
@Inject
lateinit var profileActivityPresenter: ProfileActivityPresenter
@Inject lateinit var profileActivityPresenter: ProfileActivityPresenter

@ExperimentalCoroutinesApi
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import javax.inject.Inject

/** Fragment that allows user to select a profile or create new ones. */
class ProfileChooserFragment : InjectableFragment() {
@Inject
lateinit var profileChooserFragmentPresenter: ProfileChooserFragmentPresenter
@Inject lateinit var profileChooserFragmentPresenter: ProfileChooserFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/app/story/StoryActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import javax.inject.Inject

/** Activity for stories. */
class StoryActivity : InjectableAppCompatActivity(), RouteToExplorationListener {
@Inject
lateinit var storyActivityPresenter: StoryActivityPresenter
@Inject lateinit var storyActivityPresenter: StoryActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/app/story/StoryFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ class StoryFragment : InjectableFragment(), ExplorationSelectionListener {
}
}

@Inject
lateinit var storyFragmentPresenter: StoryFragmentPresenter
@Inject lateinit var storyFragmentPresenter: StoryFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ const val BINDABLE_TEST_FRAGMENT_TAG = "bindable_adapter_test_fragment"
// TODO(#59): Make this fragment only included in relevant tests instead of all prod builds.
/** A test fragment for the bindable RecyclerView adapter. */
class BindableAdapterTestFragment: InjectableFragment() {
@Inject
lateinit var bindableAdapterTestFragmentPresenter: BindableAdapterTestFragmentPresenter
@Inject lateinit var bindableAdapterTestFragmentPresenter: BindableAdapterTestFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ import javax.inject.Inject

/** Activity to test the functionality of content-card used in [StateFragment]. */
class ContentCardTestActivity : InjectableAppCompatActivity() {
@Inject
lateinit var contentCardTestPresenter: ContentCardTestActivityPresenter
@Inject lateinit var contentCardTestPresenter: ContentCardTestActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@ import javax.inject.Inject

/** The activity for testing [TopicFragment]. */
class ExplorationTestActivity : InjectableAppCompatActivity(), RouteToExplorationListener {
@Inject
lateinit var explorationTestActivityPresenter: ExplorationTestActivityPresenter
@Inject lateinit var explorationTestActivityPresenter: ExplorationTestActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import javax.inject.Inject

/** This is a dummy activity to test Html parsing. */
class HtmlParserTestActivity : InjectableAppCompatActivity() {
@Inject
lateinit var htmlParserFactory: HtmlParser.Factory
@Inject lateinit var htmlParserFactory: HtmlParser.Factory

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ import javax.inject.Inject
/** The activity for testing [TopicFragment]. */
class TopicTestActivity : InjectableAppCompatActivity(), RouteToQuestionPlayerListener, RouteToConceptCardListener,
RouteToStoryListener, RouteToExplorationListener, ConceptCardListener {
@Inject
lateinit var topicActivityPresenter: TopicActivityPresenter
@Inject lateinit var topicActivityPresenter: TopicActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import javax.inject.Inject
class TopicTestActivityForStory : InjectableAppCompatActivity(), RouteToQuestionPlayerListener,
RouteToConceptCardListener, RouteToStoryListener,
RouteToExplorationListener, ConceptCardListener {
@Inject
lateinit var topicActivityPresenter: TopicActivityPresenter
@Inject lateinit var topicActivityPresenter: TopicActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/org/oppia/app/topic/TopicActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@ class TopicActivity : InjectableAppCompatActivity(), RouteToQuestionPlayerListen
RouteToStoryListener, RouteToExplorationListener, ConceptCardListener {
private lateinit var topicId: String
private var storyId: String? = null
@Inject
lateinit var topicActivityPresenter: TopicActivityPresenter
@Inject lateinit var topicActivityPresenter: TopicActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/org/oppia/app/topic/TopicFragment.kt
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import javax.inject.Inject

/** Fragment that contains tabs for Topic. */
class TopicFragment : InjectableFragment() {
@Inject
lateinit var topicFragmentPresenter: TopicFragmentPresenter
@Inject lateinit var topicFragmentPresenter: TopicFragmentPresenter

lateinit var topicId: String

override fun onAttach(context: Context) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import javax.inject.Inject

/** Fragment that contains overview of Topic. */
class TopicOverviewFragment : InjectableFragment() {
@Inject
lateinit var topicOverviewFragmentPresenter: TopicOverviewFragmentPresenter
@Inject lateinit var topicOverviewFragmentPresenter: TopicOverviewFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ private const val KEY_CURRENT_EXPANDED_LIST_INDEX = "CURRENT_EXPANDED_LIST_INDEX

/** Fragment that contains subtopic list for play mode. */
class TopicPlayFragment : InjectableFragment(), ExpandedChapterListIndexListener, StorySummarySelector {
@Inject
lateinit var topicPlayFragmentPresenter: TopicPlayFragmentPresenter
@Inject lateinit var topicPlayFragmentPresenter: TopicPlayFragmentPresenter

private var currentExpandedChapterListIndex: Int? = null

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ const val QUESTION_PLAYER_ACTIVITY_SKILL_ID_LIST_ARGUMENT_KEY = "QuestionPlayerA

/** Activity for QuestionPlayer in train mode. */
class QuestionPlayerActivity : InjectableAppCompatActivity() {
@Inject
lateinit var questionPlayerActivityPresenter: QuestionPlayerActivityPresenter
@Inject lateinit var questionPlayerActivityPresenter: QuestionPlayerActivityPresenter

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import javax.inject.Inject

/** Fragment that contains all questions in Question Player. */
class QuestionPlayerFragment: InjectableFragment(){
@Inject
lateinit var questionPlayerFragmentPresenter: QuestionPlayerFragmentPresenter
@Inject lateinit var questionPlayerFragmentPresenter: QuestionPlayerFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@ import javax.inject.Inject

/** Fragment that card for topic review. */
class TopicReviewFragment : InjectableFragment(), ReviewSkillSelector {
@Inject
lateinit var topicReviewFragmentPresenter: TopicReviewFragmentPresenter
@Inject lateinit var topicReviewFragmentPresenter: TopicReviewFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@ private const val KEY_SKILL_ID_LIST = "SKILL_ID_LIST"

/** Fragment that displays skills for topic train mode. */
class TopicTrainFragment : InjectableFragment() {
@Inject
lateinit var topicTrainFragmentPresenter: TopicTrainFragmentPresenter
@Inject lateinit var topicTrainFragmentPresenter: TopicTrainFragmentPresenter

override fun onAttach(context: Context) {
super.onAttach(context)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ class AudioFragmentTest {

private lateinit var activityScenario: ActivityScenario<AudioFragmentTestActivity>

@Inject
lateinit var audioPlayerController: AudioPlayerController
@Inject lateinit var audioPlayerController: AudioPlayerController
private lateinit var shadowMediaPlayer: Any

private val TEST_URL = "https://storage.googleapis.com/oppiaserver-resources/exploration/2mzzFVDLuAj8/assets/audio/content-en-057j51i2es.mp3"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,9 @@ class PersistentCacheStoreTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var cacheFactory: PersistentCacheStore.Factory
@Inject lateinit var cacheFactory: PersistentCacheStore.Factory

@Inject
lateinit var dataProviders: DataProviders
@Inject lateinit var dataProviders: DataProviders

@ExperimentalCoroutinesApi
@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,7 @@ class UserAppHistoryControllerTest {
@JvmField
val executorRule = InstantTaskExecutorRule()

@Inject
lateinit var userAppHistoryController: UserAppHistoryController
@Inject lateinit var userAppHistoryController: UserAppHistoryController

@Inject
@field:TestDispatcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ class CellularAudioDialogControllerTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var cellularAudioDialogController: CellularAudioDialogController
@Inject lateinit var cellularAudioDialogController: CellularAudioDialogController

@Inject
@field:TestDispatcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ class AnswerClassificationControllerTest {
.build()
}

@Inject
lateinit var answerClassificationController: AnswerClassificationController
@Inject lateinit var answerClassificationController: AnswerClassificationController

@Before
fun setUp() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ class ExplorationDataControllerTest {
@JvmField
val executorRule = InstantTaskExecutorRule()

@Inject
lateinit var explorationDataController: ExplorationDataController
@Inject lateinit var explorationDataController: ExplorationDataController

@Mock
lateinit var mockExplorationObserver: Observer<AsyncResult<Exploration>>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,11 @@ class ExplorationProgressControllerTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var explorationDataController: ExplorationDataController
@Inject lateinit var explorationDataController: ExplorationDataController

@Inject
lateinit var explorationProgressController: ExplorationProgressController
@Inject lateinit var explorationProgressController: ExplorationProgressController

@Inject
lateinit var explorationRetriever: ExplorationRetriever
@Inject lateinit var explorationRetriever: ExplorationRetriever

@ExperimentalCoroutinesApi
@Inject
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,9 @@ class ProfileManagementControllerTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var context: Context
@Inject lateinit var context: Context

@Inject
lateinit var profileManagementController: ProfileManagementController
@Inject lateinit var profileManagementController: ProfileManagementController

@Mock
lateinit var mockProfilesObserver: Observer<AsyncResult<List<Profile>>>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,11 @@ class ProfileTestHelperTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var context: Context
@Inject lateinit var context: Context

@Inject
lateinit var profileTestHelper: ProfileTestHelper
@Inject lateinit var profileTestHelper: ProfileTestHelper

@Inject
lateinit var profileManagementController: ProfileManagementController
@Inject lateinit var profileManagementController: ProfileManagementController

@Mock
lateinit var mockProfilesObserver: Observer<AsyncResult<List<Profile>>>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,9 @@ class QuestionAssessmentProgressControllerTest {
@JvmField
val mockitoRule: MockitoRule = MockitoJUnit.rule()

@Inject
lateinit var questionTrainingController: QuestionTrainingController
@Inject lateinit var questionTrainingController: QuestionTrainingController

@Inject
lateinit var questionAssessmentProgressController: QuestionAssessmentProgressController
@Inject lateinit var questionAssessmentProgressController: QuestionAssessmentProgressController

@Inject
@field:TestDispatcher
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,7 @@ class QuestionTrainingControllerTest {
@JvmField
val executorRule = InstantTaskExecutorRule()

@Inject
lateinit var questionTrainingController: QuestionTrainingController
@Inject lateinit var questionTrainingController: QuestionTrainingController

@Mock
lateinit var mockQuestionListObserver: Observer<AsyncResult<Any>>
Expand Down
Loading