Replace material-dialogs usage with Material Components' (#5423)

* Use Material Components' dialogs

For all dialogs that has direct replacement.

* Convert text input dialogs

* Convert quad-state multi choices dialogs

* Convert date picker dialogs

This also changes the flow to remove selected start/finish tracking date and
the track item itself

* Remove material-dialogs dependencies

app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaController.kt

@@ -289,7 +289,7 @@ class MangaController :
             }
         }
 
-        trackSheet = TrackSheet(this, manga!!)
+        trackSheet = TrackSheet(this, manga!!, (activity as MainActivity).supportFragmentManager)
 
         updateFilterIconState()
     }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DeleteChaptersDialog.kt

@@ -2,8 +2,8 @@ package eu.kanade.tachiyomi.ui.manga.chapter
 
 import android.app.Dialog
 import android.os.Bundle
-import com.afollestad.materialdialogs.MaterialDialog
 import com.bluelinelabs.conductor.Controller
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 
@@ -15,12 +15,13 @@ class DeleteChaptersDialog<T>(bundle: Bundle? = null) : DialogController(bundle)
     }
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        return MaterialDialog(activity!!)
-            .message(R.string.confirm_delete_chapters)
-            .positiveButton(android.R.string.ok) {
+        return MaterialAlertDialogBuilder(activity!!)
+            .setMessage(R.string.confirm_delete_chapters)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 (targetController as? Listener)?.deleteChapters()
             }
-            .negativeButton(android.R.string.cancel)
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     interface Listener {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/DownloadCustomChaptersDialog.kt

@@ -3,9 +3,8 @@ package eu.kanade.tachiyomi.ui.manga.chapter
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.customview.customView
 import com.bluelinelabs.conductor.Controller
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import eu.kanade.tachiyomi.widget.DialogCustomDownloadView
@@ -57,13 +56,14 @@ class DownloadCustomChaptersDialog<T> : DialogController
 
         // Build dialog.
         // when positive dialog is pressed call custom listener.
-        return MaterialDialog(activity)
-            .title(R.string.custom_download)
-            .customView(view = view, scrollable = true)
-            .positiveButton(android.R.string.ok) {
+        return MaterialAlertDialogBuilder(activity)
+            .setTitle(R.string.custom_download)
+            .setView(view)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 (targetController as? Listener)?.downloadCustomChapters(view.amount)
             }
-            .negativeButton(android.R.string.cancel)
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     interface Listener {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/chapter/SetChapterSettingsDialog.kt

@@ -3,8 +3,7 @@ package eu.kanade.tachiyomi.ui.manga.chapter
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.customview.customView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
@@ -24,13 +23,10 @@ class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle
             setOptionDescription(R.string.also_set_chapter_settings_for_library)
         }
 
-        return MaterialDialog(activity!!)
-            .title(R.string.chapter_settings)
-            .customView(
-                view = view,
-                horizontalPadding = true
-            )
-            .positiveButton(android.R.string.ok) {
+        return MaterialAlertDialogBuilder(activity!!)
+            .setTitle(R.string.chapter_settings)
+            .setView(view)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
                 ChapterSettingsHelper.setGlobalSettings(args.getSerializable(MANGA_KEY)!! as Manga)
                 if (view.isChecked()) {
                     ChapterSettingsHelper.updateAllMangasWithGlobalDefaults()
@@ -38,7 +34,8 @@ class SetChapterSettingsDialog(bundle: Bundle? = null) : DialogController(bundle
 
                 activity?.toast(activity!!.getString(R.string.chapter_settings_updated))
             }
-            .negativeButton(android.R.string.cancel)
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     private companion object {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackChaptersDialog.kt

@@ -2,15 +2,14 @@ package eu.kanade.tachiyomi.ui.manga.track
 
 import android.app.Dialog
 import android.os.Bundle
-import android.widget.NumberPicker
+import android.view.LayoutInflater
 import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.customview.customView
-import com.afollestad.materialdialogs.customview.getCustomView
 import com.bluelinelabs.conductor.Controller
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.databinding.TrackChaptersDialogBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -38,23 +37,9 @@ class SetTrackChaptersDialog<T> : DialogController
     }
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        val item = item
+        val pickerView = TrackChaptersDialogBinding.inflate(LayoutInflater.from(activity!!))
+        val np = pickerView.chaptersPicker
 
-        val dialog = MaterialDialog(activity!!)
-            .title(R.string.chapters)
-            .customView(R.layout.track_chapters_dialog, dialogWrapContent = false)
-            .positiveButton(android.R.string.ok) { dialog ->
-                val view = dialog.getCustomView()
-                // Remove focus to update selected number
-                val np: NumberPicker = view.findViewById(R.id.chapters_picker)
-                np.clearFocus()
-
-                listener.setChaptersRead(item, np.value)
-            }
-            .negativeButton(android.R.string.cancel)
-
-        val view = dialog.getCustomView()
-        val np: NumberPicker = view.findViewById(R.id.chapters_picker)
         // Set initial value
         np.value = item.track?.last_chapter_read ?: 0
 
@@ -66,7 +51,15 @@ class SetTrackChaptersDialog<T> : DialogController
         // Don't allow to go from 0 to 9999
         np.wrapSelectorWheel = false
 
-        return dialog
+        return MaterialAlertDialogBuilder(activity!!)
+            .setTitle(R.string.chapters)
+            .setView(pickerView.root)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                np.clearFocus()
+                listener.setChaptersRead(item, np.value)
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     interface Listener {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackReadingDatesDialog.kt

@@ -1,87 +0,0 @@
-package eu.kanade.tachiyomi.ui.manga.track
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.datetime.datePicker
-import com.bluelinelabs.conductor.Controller
-import eu.kanade.tachiyomi.R
-import eu.kanade.tachiyomi.data.database.models.Track
-import eu.kanade.tachiyomi.data.track.TrackManager
-import eu.kanade.tachiyomi.ui.base.controller.DialogController
-import uy.kohesive.injekt.Injekt
-import uy.kohesive.injekt.api.get
-import java.util.Calendar
-
-class SetTrackReadingDatesDialog<T> : DialogController
-        where T : Controller {
-
-    private val item: TrackItem
-
-    private val dateToUpdate: ReadingDate
-
-    private lateinit var listener: Listener
-
-    constructor(target: T, listener: Listener, dateToUpdate: ReadingDate, item: TrackItem) : super(
-        bundleOf(KEY_ITEM_TRACK to item.track)
-    ) {
-        targetController = target
-        this.listener = listener
-        this.item = item
-        this.dateToUpdate = dateToUpdate
-    }
-
-    @Suppress("unused")
-    constructor(bundle: Bundle) : super(bundle) {
-        val track = bundle.getSerializable(KEY_ITEM_TRACK) as Track
-        val service = Injekt.get<TrackManager>().getService(track.sync_id)!!
-        item = TrackItem(track, service)
-        dateToUpdate = ReadingDate.Start
-    }
-
-    @Suppress("DEPRECATION")
-    override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        return MaterialDialog(activity!!)
-            .title(
-                when (dateToUpdate) {
-                    ReadingDate.Start -> R.string.track_started_reading_date
-                    ReadingDate.Finish -> R.string.track_finished_reading_date
-                }
-            )
-            .datePicker(currentDate = getCurrentDate()) { _, date ->
-                listener.setReadingDate(item, dateToUpdate, date.timeInMillis)
-            }
-            .neutralButton(R.string.action_remove) {
-                listener.setReadingDate(item, dateToUpdate, 0L)
-            }
-    }
-
-    private fun getCurrentDate(): Calendar {
-        // Today if no date is set, otherwise the already set date
-        return Calendar.getInstance().apply {
-            item.track?.let {
-                val date = when (dateToUpdate) {
-                    ReadingDate.Start -> it.started_reading_date
-                    ReadingDate.Finish -> it.finished_reading_date
-                }
-                if (date != 0L) {
-                    timeInMillis = date
-                }
-            }
-        }
-    }
-
-    interface Listener {
-        fun setReadingDate(item: TrackItem, type: ReadingDate, date: Long)
-    }
-
-    enum class ReadingDate {
-        Start,
-        Finish
-    }
-
-    companion object {
-        private const val KEY_ITEM_TRACK = "SetTrackReadingDatesDialog.item.track"
-    }
-}

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackScoreDialog.kt

@@ -2,15 +2,14 @@ package eu.kanade.tachiyomi.ui.manga.track
 
 import android.app.Dialog
 import android.os.Bundle
-import android.widget.NumberPicker
+import android.view.LayoutInflater
 import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.customview.customView
-import com.afollestad.materialdialogs.customview.getCustomView
 import com.bluelinelabs.conductor.Controller
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
+import eu.kanade.tachiyomi.databinding.TrackScoreDialogBinding
 import eu.kanade.tachiyomi.ui.base.controller.DialogController
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -38,23 +37,9 @@ class SetTrackScoreDialog<T> : DialogController
     }
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        val item = item
+        val pickerView = TrackScoreDialogBinding.inflate(LayoutInflater.from(activity!!))
+        val np = pickerView.scorePicker
 
-        val dialog = MaterialDialog(activity!!)
-            .title(R.string.score)
-            .customView(R.layout.track_score_dialog, dialogWrapContent = false)
-            .positiveButton(android.R.string.ok) { dialog ->
-                val view = dialog.getCustomView()
-                // Remove focus to update selected number
-                val np: NumberPicker = view.findViewById(R.id.score_picker)
-                np.clearFocus()
-
-                listener.setScore(item, np.value)
-            }
-            .negativeButton(android.R.string.cancel)
-
-        val view = dialog.getCustomView()
-        val np: NumberPicker = view.findViewById(R.id.score_picker)
         val scores = item.service.getScoreList().toTypedArray()
         np.maxValue = scores.size - 1
         np.displayedValues = scores
@@ -66,7 +51,15 @@ class SetTrackScoreDialog<T> : DialogController
             np.value = if (index != -1) index else 0
         }
 
-        return dialog
+        return MaterialAlertDialogBuilder(activity!!)
+            .setTitle(R.string.score)
+            .setView(pickerView.root)
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                np.clearFocus()
+                listener.setScore(item, np.value)
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     interface Listener {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/SetTrackStatusDialog.kt

@@ -3,9 +3,8 @@ package eu.kanade.tachiyomi.ui.manga.track
 import android.app.Dialog
 import android.os.Bundle
 import androidx.core.os.bundleOf
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.list.listItemsSingleChoice
 import com.bluelinelabs.conductor.Controller
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Track
 import eu.kanade.tachiyomi.data.track.TrackManager
@@ -36,22 +35,20 @@ class SetTrackStatusDialog<T> : DialogController
     }
 
     override fun onCreateDialog(savedViewState: Bundle?): Dialog {
-        val item = item
         val statusList = item.service.getStatusList()
         val statusString = statusList.map { item.service.getStatus(it) }
-        val selectedIndex = statusList.indexOf(item.track?.status)
+        var selectedIndex = statusList.indexOf(item.track?.status)
 
-        return MaterialDialog(activity!!)
-            .title(R.string.status)
-            .negativeButton(android.R.string.cancel)
-            .listItemsSingleChoice(
-                items = statusString,
-                initialSelection = selectedIndex,
-                waitForPositiveButton = false
-            ) { dialog, position, _ ->
-                listener.setStatus(item, position)
-                dialog.dismiss()
+        return MaterialAlertDialogBuilder(activity!!)
+            .setTitle(R.string.status)
+            .setSingleChoiceItems(statusString.toTypedArray(), selectedIndex) { _, which ->
+                selectedIndex = which
             }
+            .setPositiveButton(android.R.string.ok) { _, _ ->
+                listener.setStatus(item, selectedIndex)
+            }
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
     }
 
     interface Listener {

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackAdapter.kt

@@ -5,7 +5,6 @@ import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.databinding.TrackItemBinding
 import eu.kanade.tachiyomi.util.view.applyElevationOverlay
-import uy.kohesive.injekt.api.get
 
 class TrackAdapter(listener: OnClickListener) : RecyclerView.Adapter<TrackHolder>() {
 
@@ -40,13 +39,16 @@ class TrackAdapter(listener: OnClickListener) : RecyclerView.Adapter<TrackHolder
     }
 
     interface OnClickListener {
-        fun onLogoClick(position: Int)
+        fun onOpenInBrowserClick(position: Int)
         fun onSetClick(position: Int)
         fun onTitleLongClick(position: Int)
         fun onStatusClick(position: Int)
         fun onChaptersClick(position: Int)
         fun onScoreClick(position: Int)
-        fun onStartDateClick(position: Int)
-        fun onFinishDateClick(position: Int)
+        fun onStartDateEditClick(position: Int)
+        fun onStartDateRemoveClick(position: Int)
+        fun onFinishDateEditClick(position: Int)
+        fun onFinishDateRemoveClick(position: Int)
+        fun onRemoveItemClick(position: Int)
     }
 }

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackHolder.kt

@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.RecyclerView
 import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.preference.PreferencesHelper
 import eu.kanade.tachiyomi.databinding.TrackItemBinding
+import eu.kanade.tachiyomi.util.view.popupMenu
 import uy.kohesive.injekt.injectLazy
 import java.text.DateFormat
 
@@ -17,10 +18,9 @@ class TrackHolder(private val binding: TrackItemBinding, adapter: TrackAdapter)
         preferences.dateFormat()
     }
 
-    init {
-        val listener = adapter.rowClickListener
+    private val listener = adapter.rowClickListener
 
-        binding.logoContainer.setOnClickListener { listener.onLogoClick(bindingAdapterPosition) }
+    init {
         binding.trackSet.setOnClickListener { listener.onSetClick(bindingAdapterPosition) }
         binding.trackTitle.setOnClickListener { listener.onSetClick(bindingAdapterPosition) }
         binding.trackTitle.setOnLongClickListener {
@@ -30,8 +30,6 @@ class TrackHolder(private val binding: TrackItemBinding, adapter: TrackAdapter)
         binding.trackStatus.setOnClickListener { listener.onStatusClick(bindingAdapterPosition) }
         binding.trackChapters.setOnClickListener { listener.onChaptersClick(bindingAdapterPosition) }
         binding.trackScore.setOnClickListener { listener.onScoreClick(bindingAdapterPosition) }
-        binding.trackStartDate.setOnClickListener { listener.onStartDateClick(bindingAdapterPosition) }
-        binding.trackFinishDate.setOnClickListener { listener.onFinishDateClick(bindingAdapterPosition) }
     }
 
     @SuppressLint("SetTextI18n")
@@ -42,6 +40,7 @@ class TrackHolder(private val binding: TrackItemBinding, adapter: TrackAdapter)
 
         binding.trackSet.isVisible = track == null
         binding.trackTitle.isVisible = track != null
+        binding.more.isVisible = track != null
 
         binding.middleRow.isVisible = track != null
         binding.bottomDivider.isVisible = track != null
@@ -77,20 +76,55 @@ class TrackHolder(private val binding: TrackItemBinding, adapter: TrackAdapter)
                 if (track.started_reading_date != 0L) {
                     binding.trackStartDate.text = dateFormat.format(track.started_reading_date)
                     binding.trackStartDate.alpha = SET_STATUS_TEXT_ALPHA
+                    binding.trackStartDate.setOnClickListener {
+                        it.popupMenu(R.menu.track_item_date) {
+                            when (itemId) {
+                                R.id.action_edit -> listener.onStartDateEditClick(bindingAdapterPosition)
+                                R.id.action_remove -> listener.onStartDateRemoveClick(bindingAdapterPosition)
+                            }
+                        }
+                    }
                 } else {
                     binding.trackStartDate.text = ctx.getString(R.string.track_started_reading_date)
                     binding.trackStartDate.alpha = UNSET_STATUS_TEXT_ALPHA
+                    binding.trackStartDate.setOnClickListener {
+                        listener.onStartDateEditClick(bindingAdapterPosition)
+                    }
                 }
                 if (track.finished_reading_date != 0L) {
                     binding.trackFinishDate.text = dateFormat.format(track.finished_reading_date)
                     binding.trackFinishDate.alpha = SET_STATUS_TEXT_ALPHA
+                    binding.trackFinishDate.setOnClickListener {
+                        it.popupMenu(R.menu.track_item_date) {
+                            when (itemId) {
+                                R.id.action_edit -> listener.onFinishDateEditClick(bindingAdapterPosition)
+                                R.id.action_remove -> listener.onFinishDateRemoveClick(bindingAdapterPosition)
+                            }
+                        }
+                    }
                 } else {
                     binding.trackFinishDate.text = ctx.getString(R.string.track_finished_reading_date)
                     binding.trackFinishDate.alpha = UNSET_STATUS_TEXT_ALPHA
+                    binding.trackFinishDate.setOnClickListener {
+                        listener.onFinishDateEditClick(bindingAdapterPosition)
+                    }
                 }
             }
             binding.bottomDivider.isVisible = supportsReadingDates
             binding.bottomRow.isVisible = supportsReadingDates
+
+            binding.more.setOnClickListener {
+                it.popupMenu(R.menu.track_item) {
+                    when (itemId) {
+                        R.id.action_open_in_browser -> {
+                            listener.onOpenInBrowserClick(bindingAdapterPosition)
+                        }
+                        R.id.action_remove -> {
+                            listener.onRemoveItemClick(bindingAdapterPosition)
+                        }
+                    }
+                }
+            }
         }
     }
 

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchDialog.kt

@@ -74,14 +74,9 @@ class TrackSearchDialog : DialogController {
                         dialog?.dismiss()
                     }
                 }
-                R.id.remove -> {
-                    trackController.presenter.unregisterTracking(service)
-                    dialog?.dismiss()
-                }
             }
             true
         }
-        binding!!.toolbar.menu.findItem(R.id.remove).isVisible = currentTrackUrl != null
 
         // Create adapter
         adapter = TrackSearchAdapter(currentTrackUrl) { which ->

app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSheet.kt

@@ -3,9 +3,14 @@ package eu.kanade.tachiyomi.ui.manga.track
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
+import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import eu.kanade.tachiyomi.R.string
+import com.google.android.material.datepicker.CalendarConstraints
+import com.google.android.material.datepicker.DateValidatorPointBackward
+import com.google.android.material.datepicker.DateValidatorPointForward
+import com.google.android.material.datepicker.MaterialDatePicker
+import eu.kanade.tachiyomi.R
 import eu.kanade.tachiyomi.data.database.models.Manga
 import eu.kanade.tachiyomi.data.track.UnattendedTrackService
 import eu.kanade.tachiyomi.databinding.TrackControllerBinding
@@ -13,6 +18,7 @@ import eu.kanade.tachiyomi.source.SourceManager
 import eu.kanade.tachiyomi.ui.base.controller.openInBrowser
 import eu.kanade.tachiyomi.ui.manga.MangaController
 import eu.kanade.tachiyomi.util.lang.launchIO
+import eu.kanade.tachiyomi.util.lang.toUtcCalendar
 import eu.kanade.tachiyomi.util.lang.withUIContext
 import eu.kanade.tachiyomi.util.system.copyToClipboard
 import eu.kanade.tachiyomi.util.system.toast
@@ -23,13 +29,13 @@ import uy.kohesive.injekt.api.get
 class TrackSheet(
     val controller: MangaController,
     val manga: Manga,
+    val fragmentManager: FragmentManager,
     private val sourceManager: SourceManager = Injekt.get()
 ) : BaseBottomSheetDialog(controller.activity!!),
     TrackAdapter.OnClickListener,
     SetTrackStatusDialog.Listener,
     SetTrackChaptersDialog.Listener,
-    SetTrackScoreDialog.Listener,
-    SetTrackReadingDatesDialog.Listener {
+    SetTrackScoreDialog.Listener {
 
     private lateinit var binding: TrackControllerBinding
 
@@ -63,7 +69,7 @@ class TrackSheet(
         }
     }
 
-    override fun onLogoClick(position: Int) {
+    override fun onOpenInBrowserClick(position: Int) {
         val track = adapter.getItem(position)?.track ?: return
 
         if (track.tracking_url.isNotBlank()) {
@@ -81,7 +87,7 @@ class TrackSheet(
             }
 
             if (!item.service.accept(sourceManager.getOrStub(manga.source))) {
-                controller.presenter.view?.applicationContext?.toast(string.source_unsupported)
+                controller.presenter.view?.applicationContext?.toast(R.string.source_unsupported)
                 return
             }
 
@@ -90,9 +96,9 @@ class TrackSheet(
                     item.service.match(manga)?.let { track ->
                         controller.presenter.registerTracking(track, item.service)
                     }
-                        ?: withUIContext { controller.presenter.view?.applicationContext?.toast(string.error_no_match) }
+                        ?: withUIContext { controller.presenter.view?.applicationContext?.toast(R.string.error_no_match) }
                 } catch (e: Exception) {
-                    withUIContext { controller.presenter.view?.applicationContext?.toast(string.error_no_match) }
+                    withUIContext { controller.presenter.view?.applicationContext?.toast(R.string.error_no_match) }
                 }
             }
         } else {
@@ -128,18 +134,74 @@ class TrackSheet(
         SetTrackScoreDialog(controller, this, item).showDialog(controller.router)
     }
 
-    override fun onStartDateClick(position: Int) {
+    override fun onStartDateEditClick(position: Int) {
         val item = adapter.getItem(position) ?: return
         if (item.track == null) return
 
-        SetTrackReadingDatesDialog(controller, this, SetTrackReadingDatesDialog.ReadingDate.Start, item).showDialog(controller.router)
+        val selection = item.track.started_reading_date.toUtcCalendar()?.timeInMillis
+            ?: MaterialDatePicker.todayInUtcMilliseconds()
+
+        // No time travellers allowed
+        val constraints = CalendarConstraints.Builder().apply {
+            val finishedMillis = item.track.finished_reading_date.toUtcCalendar()?.timeInMillis
+            if (finishedMillis != null) {
+                setValidator(DateValidatorPointBackward.before(finishedMillis))
+            }
+        }.build()
+
+        val picker = MaterialDatePicker.Builder.datePicker()
+            .setTitleText(R.string.track_started_reading_date)
+            .setSelection(selection)
+            .setCalendarConstraints(constraints)
+            .build()
+        picker.addOnPositiveButtonClickListener {
+            controller.presenter.setTrackerStartDate(item, it)
+        }
+        picker.show(fragmentManager, null)
     }
 
-    override fun onFinishDateClick(position: Int) {
+    override fun onFinishDateEditClick(position: Int) {
         val item = adapter.getItem(position) ?: return
         if (item.track == null) return
 
-        SetTrackReadingDatesDialog(controller, this, SetTrackReadingDatesDialog.ReadingDate.Finish, item).showDialog(controller.router)
+        val selection = item.track.finished_reading_date.toUtcCalendar()?.timeInMillis
+            ?: MaterialDatePicker.todayInUtcMilliseconds()
+
+        // No time travellers allowed
+        val constraints = CalendarConstraints.Builder().apply {
+            val startMillis = item.track.started_reading_date.toUtcCalendar()?.timeInMillis
+            if (startMillis != null) {
+                setValidator(DateValidatorPointForward.from(item.track.started_reading_date))
+            }
+        }.build()
+
+        val picker = MaterialDatePicker.Builder.datePicker()
+            .setTitleText(R.string.track_finished_reading_date)
+            .setSelection(selection)
+            .setCalendarConstraints(constraints)
+            .build()
+        picker.addOnPositiveButtonClickListener {
+            controller.presenter.setTrackerFinishDate(item, it)
+        }
+        picker.show(fragmentManager, null)
+    }
+
+    override fun onStartDateRemoveClick(position: Int) {
+        val item = adapter.getItem(position) ?: return
+        if (item.track == null) return
+        controller.presenter.setTrackerStartDate(item, 0)
+    }
+
+    override fun onFinishDateRemoveClick(position: Int) {
+        val item = adapter.getItem(position) ?: return
+        if (item.track == null) return
+        controller.presenter.setTrackerFinishDate(item, 0)
+    }
+
+    override fun onRemoveItemClick(position: Int) {
+        val item = adapter.getItem(position) ?: return
+        if (item.track == null) return
+        controller.presenter.unregisterTracking(item.service)
     }
 
     override fun setStatus(item: TrackItem, selection: Int) {
@@ -154,13 +216,6 @@ class TrackSheet(
         controller.presenter.setTrackerScore(item, score)
     }
 
-    override fun setReadingDate(item: TrackItem, type: SetTrackReadingDatesDialog.ReadingDate, date: Long) {
-        when (type) {
-            SetTrackReadingDatesDialog.ReadingDate.Start -> controller.presenter.setTrackerStartDate(item, date)
-            SetTrackReadingDatesDialog.ReadingDate.Finish -> controller.presenter.setTrackerFinishDate(item, date)
-        }
-    }
-
     fun getSearchDialog(): TrackSearchDialog? {
         return controller.router.getControllerWithTag(TAG_SEARCH_CONTROLLER) as? TrackSearchDialog
     }