diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt index f7d8f28414a..d230cf6bf70 100644 --- a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt +++ b/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt @@ -1,31 +1,25 @@ package org.oppia.app.profile import android.content.ActivityNotFoundException -import android.content.Context import android.content.Intent import android.net.Uri -import android.os.Handler import android.text.Editable import android.text.TextWatcher +import android.view.animation.AnimationUtils import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.databinding.DataBindingUtil import androidx.fragment.app.DialogFragment import androidx.lifecycle.Observer +import kotlinx.coroutines.ExperimentalCoroutinesApi import org.oppia.app.R import org.oppia.app.databinding.PinPasswordActivityBinding import org.oppia.app.home.HomeActivity import org.oppia.app.model.ProfileId +import org.oppia.app.utility.LifecycleSafeTimerFactory import org.oppia.app.viewmodel.ViewModelProvider import org.oppia.domain.profile.ProfileManagementController import javax.inject.Inject -import android.view.animation.AnimationUtils -import androidx.lifecycle.lifecycleScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.delay -import kotlinx.coroutines.launch -import org.oppia.app.utility.LifecycleSafeTimerFactory private const val TAG_ADMIN_SETTINGS_DIALOG = "ADMIN_SETTNIGS_DIALOG" private const val TAG_RESET_PIN_DIALOG = "RESET_PIN_DIALOG" diff --git a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt b/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt index 80afa29e4a2..9ad577e6916 100644 --- a/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt +++ b/app/src/main/java/org/oppia/app/profile/ProfileChooserFragment.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import kotlinx.coroutines.ExperimentalCoroutinesApi import org.oppia.app.fragment.InjectableFragment import javax.inject.Inject diff --git a/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt b/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt index 05a0f5110a2..9adb2bdd374 100644 --- a/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt +++ b/app/src/main/java/org/oppia/app/profile/ResetPinDialogFragmentPresenter.kt @@ -1,7 +1,6 @@ package org.oppia.app.profile import android.app.Dialog -import android.content.Context import android.text.Editable import android.text.TextWatcher import androidx.appcompat.app.AlertDialog diff --git a/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt b/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt index 7e8f5d285ce..4d5a22fa673 100644 --- a/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt +++ b/app/src/main/java/org/oppia/app/testing/AudioFragmentTestActivityPresenter.kt @@ -8,7 +8,6 @@ import org.oppia.app.model.SubtitledHtml import org.oppia.app.model.Voiceover import org.oppia.app.model.VoiceoverMapping import org.oppia.app.player.audio.AudioFragment -import org.oppia.domain.topic.RATIOS_EXPLORATION_ID_0 import javax.inject.Inject /** The presenter for [AudioFragmentTestActivity] */ diff --git a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt b/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt index 5a1c637a121..f94d3cc7f88 100644 --- a/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt +++ b/app/src/main/java/org/oppia/app/topic/conceptcard/ConceptCardViewModel.kt @@ -1,6 +1,5 @@ package org.oppia.app.topic.conceptcard -import android.widget.TextView import androidx.lifecycle.LiveData import androidx.lifecycle.Transformations import androidx.lifecycle.ViewModel diff --git a/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt b/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt index c3fb7c3e031..5675a10db5d 100644 --- a/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/app/player/audio/AudioFragmentTest.kt @@ -6,7 +6,6 @@ import android.content.res.Configuration import android.media.MediaPlayer import android.net.Uri import android.view.View -import android.widget.ImageView import android.widget.SeekBar import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider diff --git a/app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt b/app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt index 40899939d5c..43dd1bfb7f3 100644 --- a/app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt +++ b/app/src/sharedTest/java/org/oppia/app/profile/ProfileChooserFragmentTest.kt @@ -5,8 +5,6 @@ import android.content.Context import androidx.recyclerview.widget.RecyclerView import androidx.test.core.app.ActivityScenario import androidx.test.core.app.ApplicationProvider -import androidx.test.ext.junit.runners.AndroidJUnit4 -import kotlinx.coroutines.ExperimentalCoroutinesApi import androidx.test.espresso.Espresso.onView import androidx.test.espresso.action.ViewActions.click import androidx.test.espresso.assertion.ViewAssertions.matches @@ -17,14 +15,13 @@ import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent import androidx.test.espresso.matcher.ViewMatchers.isDisplayed import androidx.test.espresso.matcher.ViewMatchers.withId import androidx.test.espresso.matcher.ViewMatchers.withText +import androidx.test.ext.junit.runners.AndroidJUnit4 import dagger.BindsInstance import dagger.Component import dagger.Module import dagger.Provides import kotlinx.coroutines.CoroutineDispatcher -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.GlobalScope -import kotlinx.coroutines.launch +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestCoroutineDispatcher import org.hamcrest.Matchers.not import org.junit.After @@ -33,9 +30,9 @@ import org.junit.Test import org.junit.runner.RunWith import org.oppia.app.R import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPosition -import org.oppia.domain.profile.ProfileTestHelper import org.oppia.app.recyclerview.RecyclerViewMatcher.Companion.atPositionOnView import org.oppia.domain.profile.ProfileManagementController +import org.oppia.domain.profile.ProfileTestHelper import org.oppia.util.logging.EnableConsoleLog import org.oppia.util.logging.EnableFileLog import org.oppia.util.logging.GlobalLogLevel diff --git a/domain/src/main/java/org/oppia/domain/topic/TopicController.kt b/domain/src/main/java/org/oppia/domain/topic/TopicController.kt index 63ef3d73b33..3c8ace2d685 100644 --- a/domain/src/main/java/org/oppia/domain/topic/TopicController.kt +++ b/domain/src/main/java/org/oppia/domain/topic/TopicController.kt @@ -24,7 +24,6 @@ import org.oppia.domain.util.StateRetriever import org.oppia.util.data.AsyncResult import org.oppia.util.data.DataProvider import org.oppia.util.data.DataProviders -import java.io.File import javax.inject.Inject import javax.inject.Singleton diff --git a/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt b/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt index ea0bf1cc0ee..c389d8a9e7d 100644 --- a/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt +++ b/domain/src/test/java/org/oppia/domain/profile/ProfileManagementControllerTest.kt @@ -34,7 +34,6 @@ import org.mockito.junit.MockitoRule import org.oppia.app.model.Profile import org.oppia.app.model.ProfileDatabase import org.oppia.app.model.ProfileId -import org.oppia.domain.R import org.oppia.util.data.AsyncResult import org.oppia.util.logging.EnableConsoleLog import org.oppia.util.logging.EnableFileLog diff --git a/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt b/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt index ab498bdf91e..4db48ea94d3 100644 --- a/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt +++ b/domain/src/test/java/org/oppia/domain/question/QuestionTrainingControllerTest.kt @@ -28,10 +28,8 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Captor import org.mockito.Mock -import org.mockito.Mockito import org.mockito.Mockito.atLeastOnce import org.mockito.Mockito.verify -import org.mockito.MockitoAnnotations import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule import org.oppia.app.model.Question