Fixed ktlint errors

oppia · Aug 10, 2020 · 161c679 · 161c679
1 parent 3ff4be0
commit 161c679
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 14 deletions.
diff --git a/...ntrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt b/...ntrols/administratorcontrolsitemviewmodel/AdministratorControlsAccountActionsViewModel.kt
@@ -3,8 +3,8 @@ package org.oppia.app.administratorcontrols.administratorcontrolsitemviewmodel
 import android.content.Intent
 import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
-import org.oppia.app.shim.IntentFactoryShimInterface
 import org.oppia.app.R
+import org.oppia.app.shim.IntentFactoryShimInterface
 
 /** [ViewModel] for the recycler view in [AdministratorControlsFragment]. */
 class AdministratorControlsAccountActionsViewModel(

diff --git a/app/src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt b/app/src/main/java/org/oppia/app/customview/LessonThumbnailImageView.kt
@@ -5,10 +5,10 @@ import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import org.oppia.app.R
 import org.oppia.app.model.LessonThumbnail
 import org.oppia.app.model.LessonThumbnailGraphic
 import org.oppia.app.shim.ViewComponentFactory
-import org.oppia.app.R
 import org.oppia.util.gcsresource.DefaultResourceBucketName
 import org.oppia.util.parser.DefaultGcsPrefix
 import org.oppia.util.parser.ImageLoader

diff --git a/app/src/main/java/org/oppia/app/help/faq/FAQListViewModel.kt b/app/src/main/java/org/oppia/app/help/faq/FAQListViewModel.kt
@@ -2,10 +2,10 @@ package org.oppia.app.help.faq
 
 import androidx.appcompat.app.AppCompatActivity
 import androidx.lifecycle.ViewModel
+import org.oppia.app.R
 import org.oppia.app.help.faq.faqItemViewModel.FAQContentViewModel
 import org.oppia.app.help.faq.faqItemViewModel.FAQHeaderViewModel
 import org.oppia.app.help.faq.faqItemViewModel.FAQItemViewModel
-import org.oppia.app.R
 import javax.inject.Inject
 
 /** View model in [FAQListFragment]. */

diff --git a/app/src/main/java/org/oppia/app/onboarding/OnboadingSlideViewModel.kt b/app/src/main/java/org/oppia/app/onboarding/OnboadingSlideViewModel.kt
@@ -5,8 +5,8 @@ import android.content.res.Configuration
 import android.content.res.Resources
 import androidx.databinding.ObservableField
 import androidx.lifecycle.ViewModel
-import org.oppia.app.viewmodel.ObservableViewModel
 import org.oppia.app.R
+import org.oppia.app.viewmodel.ObservableViewModel
 
 const val TOTAL_NUMBER_OF_SLIDES = 4
 

diff --git a/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt b/app/src/main/java/org/oppia/app/parser/StringToFractionParser.kt
@@ -2,8 +2,8 @@ package org.oppia.app.parser
 
 import android.content.Context
 import androidx.annotation.StringRes
-import org.oppia.app.model.Fraction
 import org.oppia.app.R
+import org.oppia.app.model.Fraction
 import org.oppia.domain.util.normalizeWhitespace
 
 /** This class contains method that helps to parse string to fraction. */

diff --git a/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt b/app/src/main/java/org/oppia/app/player/state/StateFragmentPresenter.kt
@@ -13,6 +13,7 @@ import androidx.lifecycle.Observer
 import androidx.lifecycle.Transformations
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import org.oppia.app.R
 import org.oppia.app.databinding.StateFragmentBinding
 import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.model.AnswerOutcome
@@ -28,7 +29,6 @@ import org.oppia.app.player.audio.AudioFragment
 import org.oppia.app.player.audio.AudioUiManager
 import org.oppia.app.player.state.listener.RouteToHintsAndSolutionListener
 import org.oppia.app.player.stopplaying.StopStatePlayingSessionListener
-import org.oppia.app.R
 import org.oppia.app.utility.LifecycleSafeTimerFactory
 import org.oppia.app.utility.SplitScreenManager
 import org.oppia.app.viewmodel.ViewModelProvider

diff --git a/app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt b/app/src/main/java/org/oppia/app/player/state/itemviewmodel/FractionInteractionViewModel.kt
@@ -6,14 +6,14 @@ import android.text.TextWatcher
 import androidx.databinding.Bindable
 import androidx.databinding.Observable
 import androidx.databinding.ObservableField
+import org.oppia.app.R
 import org.oppia.app.model.Interaction
 import org.oppia.app.model.InteractionObject
 import org.oppia.app.model.UserAnswer
 import org.oppia.app.parser.StringToFractionParser
 import org.oppia.app.player.state.answerhandling.AnswerErrorCategory
 import org.oppia.app.player.state.answerhandling.InteractionAnswerErrorOrAvailabilityCheckReceiver
 import org.oppia.app.player.state.answerhandling.InteractionAnswerHandler
-import org.oppia.app.R
 
 /** [StateItemViewModel] for the fraction input interaction. */
 class FractionInteractionViewModel(

diff --git a/...java/org/oppia/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt b/...java/org/oppia/app/player/state/itemviewmodel/ImageRegionSelectionInteractionViewModel.kt
@@ -3,6 +3,7 @@ package org.oppia.app.player.state.itemviewmodel
 import android.content.Context
 import androidx.databinding.Observable
 import androidx.databinding.ObservableField
+import org.oppia.app.R
 import org.oppia.app.model.ClickOnImage
 import org.oppia.app.model.ImageWithRegions
 import org.oppia.app.model.Interaction
@@ -14,7 +15,6 @@ import org.oppia.app.utility.DefaultRegionClickedEvent
 import org.oppia.app.utility.NamedRegionClickedEvent
 import org.oppia.app.utility.OnClickableAreaClickedListener
 import org.oppia.app.utility.RegionClickedEvent
-import org.oppia.app.R
 
 /** [StateItemViewModel] for image region selection. */
 class ImageRegionSelectionInteractionViewModel(

diff --git a/app/src/main/java/org/oppia/app/profile/ProfileInputView.kt b/app/src/main/java/org/oppia/app/profile/ProfileInputView.kt
@@ -12,9 +12,9 @@ import android.widget.TextView
 import androidx.databinding.BindingAdapter
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
+import org.oppia.app.R
 import org.oppia.app.shim.ViewBindingShimInterface
 import org.oppia.app.shim.ViewComponentFactory
-import org.oppia.app.R
 import javax.inject.Inject
 
 /** Custom view that is used for name or pin input with error messages. */

diff --git a/app/src/main/java/org/oppia/app/shim/IntentFactoryShim.kt b/app/src/main/java/org/oppia/app/shim/IntentFactoryShim.kt
@@ -31,9 +31,15 @@ class IntentFactoryShim @Inject constructor() : IntentFactoryShimInterface {
     return intent
   }
 
-  override fun createRecentlyPlayedActivityIntent(context: Context, internalProfileId: Int): Intent {
+  override fun createRecentlyPlayedActivityIntent(
+    context: Context,
+    internalProfileId: Int
+  ): Intent {
     val intent = Intent(context, RecentlyPlayedActivity::class.java)
-    intent.putExtra(RecentlyPlayedActivity.RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY, internalProfileId)
+    intent.putExtra(
+      RecentlyPlayedActivity.RECENTLY_PLAYED_ACTIVITY_INTERNAL_PROFILE_ID_KEY,
+      internalProfileId
+    )
     return intent
   }
 }
diff --git a/app/src/main/java/org/oppia/app/topic/info/TopicInfoViewModel.kt b/app/src/main/java/org/oppia/app/topic/info/TopicInfoViewModel.kt
@@ -3,10 +3,10 @@ package org.oppia.app.topic.info
 import android.content.Context
 import androidx.databinding.ObservableField
 import androidx.lifecycle.ViewModel
+import org.oppia.app.R
 import org.oppia.app.fragment.FragmentScope
 import org.oppia.app.model.Topic
 import org.oppia.app.viewmodel.ObservableViewModel
-import org.oppia.app.R
 import org.oppia.util.parser.TopicHtmlParserEntityType
 import javax.inject.Inject
 

diff --git a/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentPresenter.kt b/app/src/main/java/org/oppia/app/topic/revisioncard/RevisionCardFragmentPresenter.kt
@@ -33,7 +33,7 @@ class RevisionCardFragmentPresenter @Inject constructor(
         container,
         /* attachToRoot= */ false
       )
-    val view = binding.revisionCardExplanationText;
+    val view = binding.revisionCardExplanationText
     val viewModel = getReviewCardViewModel()
 
     viewModel.setSubtopicIdAndBinding(topicId, subtopicId, view)

diff --git a/app/src/main/java/org/oppia/app/utility/ClickableAreasImage.kt b/app/src/main/java/org/oppia/app/utility/ClickableAreasImage.kt
@@ -6,10 +6,10 @@ import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.forEachIndexed
 import androidx.core.view.isVisible
+import org.oppia.app.R
 import org.oppia.app.model.ImageWithRegions
 import org.oppia.app.player.state.ImageRegionSelectionInteractionView
 import org.oppia.app.shim.ViewBindingShimInterface
-import org.oppia.app.R
 import kotlin.math.roundToInt
 
 /**