mirror/Anki-Android
0
0
Fork 0
mirror of https://github.com/ankidroid/Anki-Android.git synced 2024-09-20 20:03:05 +02:00
Code

lint: use requireContext/requireArguments/requireActivity

Browse Source 
vs the !! versions of enforcing context / arguments / activity are there for use

flagged by enhanced AGP7.1+ lint checking
This commit is contained in:
Mike Hardy 2022-01-26 11:55:53 -05:00
parent 05cdd6e6b3
commit 0f3bf11ef9
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.kt
View File

@ -127,7 +127,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
i.putExtra("defaultConfig", defaultConfig) i.putExtra("defaultConfig", defaultConfig)
Timber.i("openFilteredDeckOptions()") Timber.i("openFilteredDeckOptions()")
onDeckOptionsActivityResult.launch(i) onDeckOptionsActivityResult.launch(i)
slide(activity!!, ActivityTransitionAnimation.Direction.FADE) slide(requireActivity(), ActivityTransitionAnimation.Direction.FADE)
} }
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -135,7 +135,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
// If we're being restored, don't launch deck options again. // If we're being restored, don't launch deck options again.
if (savedInstanceState == null && arguments != null) { if (savedInstanceState == null && arguments != null) {
mLoadWithDeckOptions = arguments!!.getBoolean("withDeckOptions") mLoadWithDeckOptions = requireArguments().getBoolean("withDeckOptions")
} }
} }
@ -147,7 +147,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
} }
val studyOptionsView = inflater.inflate(R.layout.studyoptions_fragment, container, false) val studyOptionsView = inflater.inflate(R.layout.studyoptions_fragment, container, false)
mStudyOptionsView = studyOptionsView mStudyOptionsView = studyOptionsView
mFragmented = activity!!.javaClass != StudyOptionsActivity::class.java mFragmented = requireActivity().javaClass != StudyOptionsActivity::class.java
initAllContentViews(studyOptionsView) initAllContentViews(studyOptionsView)
mToolbar = studyOptionsView.findViewById(R.id.studyOptionsToolbar) mToolbar = studyOptionsView.findViewById(R.id.studyOptionsToolbar)
if (mToolbar != null) { if (mToolbar != null) {
@ -197,13 +197,13 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
// Go to DeckPicker after studying when not tablet // Go to DeckPicker after studying when not tablet
reviewer.flags = Intent.FLAG_ACTIVITY_FORWARD_RESULT reviewer.flags = Intent.FLAG_ACTIVITY_FORWARD_RESULT
startActivity(reviewer) startActivity(reviewer)
activity!!.finish() requireActivity().finish()
} }
animateLeft() animateLeft()
} }
private fun animateLeft() { private fun animateLeft() {
slide(activity!!, ActivityTransitionAnimation.Direction.START) slide(requireActivity(), ActivityTransitionAnimation.Direction.START)
} }
private fun initAllContentViews(studyOptionsView: View) { private fun initAllContentViews(studyOptionsView: View) {
@ -266,7 +266,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
val i = Intent(activity, DeckOptions::class.java) val i = Intent(activity, DeckOptions::class.java)
Timber.i("Opening deck options for activity result") Timber.i("Opening deck options for activity result")
onDeckOptionsActivityResult.launch(i) onDeckOptionsActivityResult.launch(i)
slide(activity!!, ActivityTransitionAnimation.Direction.FADE) slide(requireActivity(), ActivityTransitionAnimation.Direction.FADE)
} }
return true return true
} }
@ -285,7 +285,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
R.id.action_rebuild -> { R.id.action_rebuild -> {
Timber.i("StudyOptionsFragment:: rebuild cram deck button pressed") Timber.i("StudyOptionsFragment:: rebuild cram deck button pressed")
mProgressDialog = show( mProgressDialog = show(
activity!!, null, requireActivity(), null,
resources.getString(R.string.rebuild_filtered_deck), true resources.getString(R.string.rebuild_filtered_deck), true
) )
TaskManager.launchCollectionTask(RebuildCram(), getCollectionTaskListener(true)) TaskManager.launchCollectionTask(RebuildCram(), getCollectionTaskListener(true))
@ -294,7 +294,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
R.id.action_empty -> { R.id.action_empty -> {
Timber.i("StudyOptionsFragment:: empty cram deck button pressed") Timber.i("StudyOptionsFragment:: empty cram deck button pressed")
mProgressDialog = show( mProgressDialog = show(
activity!!, null, requireActivity(), null,
resources.getString(R.string.empty_filtered_deck), false resources.getString(R.string.empty_filtered_deck), false
) )
TaskManager.launchCollectionTask(EmptyCram(), getCollectionTaskListener(true)) TaskManager.launchCollectionTask(EmptyCram(), getCollectionTaskListener(true))
@ -365,7 +365,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
} }
// Set the back button listener // Set the back button listener
if (!mFragmented) { if (!mFragmented) {
val icon = AppCompatResources.getDrawable(context!!, R.drawable.ic_arrow_back_white) val icon = AppCompatResources.getDrawable(requireContext(), R.drawable.ic_arrow_back_white)
icon!!.isAutoMirrored = true icon!!.isAutoMirrored = true
mToolbar!!.navigationIcon = icon mToolbar!!.navigationIcon = icon
mToolbar!!.setNavigationOnClickListener { (activity as AnkiActivity?)!!.finishWithAnimation(ActivityTransitionAnimation.Direction.END) } mToolbar!!.setNavigationOnClickListener { (activity as AnkiActivity?)!!.finishWithAnimation(ActivityTransitionAnimation.Direction.END) }
@ -403,7 +403,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
// If no more cards getting returned while counts > 0 (due to learn ahead limit) then show a snackbar // If no more cards getting returned while counts > 0 (due to learn ahead limit) then show a snackbar
if (col!!.sched.count() > 0 && mStudyOptionsView != null) { if (col!!.sched.count() > 0 && mStudyOptionsView != null) {
val rootLayout = mStudyOptionsView!!.findViewById<View>(R.id.studyoptions_main) val rootLayout = mStudyOptionsView!!.findViewById<View>(R.id.studyoptions_main)
showSnackbar(activity!!, R.string.studyoptions_no_cards_due, false, 0, null, rootLayout) showSnackbar(requireActivity(), R.string.studyoptions_no_cards_due, false, 0, null, rootLayout)
} }
} }
} }
@ -421,7 +421,7 @@ class StudyOptionsFragment : Fragment(), Toolbar.OnMenuItemClickListener {
deck.remove("empty") deck.remove("empty")
} }
mProgressDialog = show( mProgressDialog = show(
activity!!, null, requireActivity(), null,
resources.getString(R.string.rebuild_filtered_deck), true resources.getString(R.string.rebuild_filtered_deck), true
) )
TaskManager.launchCollectionTask(RebuildCram(), getCollectionTaskListener(true)) TaskManager.launchCollectionTask(RebuildCram(), getCollectionTaskListener(true))

2
AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/PickStringDialogFragment.kt
View File

@ -43,7 +43,7 @@ class PickStringDialogFragment : DialogFragment() {
val builder = AlertDialog.Builder(activity) val builder = AlertDialog.Builder(activity)
builder.setTitle(mTitle) builder.setTitle(mTitle)
val adapter = ArrayAdapter( val adapter = ArrayAdapter(
this.activity!!, requireActivity(),
R.layout.simple_list_item_1, mPossibleChoices!! R.layout.simple_list_item_1, mPossibleChoices!!
) )
builder.setAdapter(adapter, mListener) builder.setAdapter(adapter, mListener)