Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import android.os.Bundle
import androidx.core.os.bundleOf
import androidx.fragment.app.Fragment
import androidx.fragment.app.commit
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.button.MaterialButton
import com.ichi2.anki.AnkiActivity
import com.ichi2.anki.R
import com.ichi2.anki.databinding.ActivityMultimediaBinding
import com.ichi2.anki.multimediacard.IMultimediaEditableNote
import com.ichi2.anki.multimediacard.fields.IField
import com.ichi2.anki.snackbar.BaseSnackbarBuilderProvider
Expand All @@ -35,6 +35,7 @@ import com.ichi2.compat.CompatHelper.Companion.getSerializableCompat
import com.ichi2.compat.CompatHelper.Companion.getSerializableExtraCompat
import com.ichi2.themes.setTransparentStatusBar
import com.ichi2.utils.FragmentFactoryUtils
import dev.androidbroadcast.vbpd.viewBinding
import timber.log.Timber
import java.io.Serializable
import kotlin.reflect.KClass
Expand All @@ -60,8 +61,10 @@ data class MultimediaActivityExtra(
* Multimedia activity that allows users to attach media files to an input field in NoteEditor.
*/
class MultimediaActivity :
AnkiActivity(),
AnkiActivity(R.layout.activity_multimedia),
BaseSnackbarBuilderProvider {
private val binding by viewBinding(ActivityMultimediaBinding::bind)

private val Intent.multimediaArgsExtra: MultimediaActivityExtra?
get() = extras?.getSerializableCompat(MULTIMEDIA_ARGS_EXTRA)

Expand All @@ -73,11 +76,8 @@ class MultimediaActivity :
return
}
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_multimedia)
setTransparentStatusBar()

val toolbar: MaterialToolbar = findViewById(R.id.toolbar)
setSupportActionBar(toolbar)
setSupportActionBar(binding.toolbar)

// avoid recreating the fragment on configuration changes
if (savedInstanceState != null) {
Expand All @@ -102,7 +102,7 @@ class MultimediaActivity :
replace(R.id.fragment_container, fragment)
}

toolbar.setNavigationOnClickListener {
binding.toolbar.setNavigationOnClickListener {
Timber.d("MultimediaActivity:: Back pressed")
onBackPressedDispatcher.onBackPressed()
}
Expand Down