From e189d17fd5bc21e51e14329e37ea9b5fd40bb77d Mon Sep 17 00:00:00 2001 From: Jakub Kalinowski Date: Sun, 14 Aug 2022 12:24:44 +0200 Subject: [PATCH] Removing unrelated changes --- .../activities/common/dialogs/ColorPickerDialog.kt | 2 +- .../activities/common/dialogs/HistoryEditorDialog.kt | 10 +++++----- .../activities/common/dialogs/WeekdayPickerDialog.kt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt index 3f141f3a9..4d9dd130a 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ColorPickerDialog.kt @@ -31,7 +31,7 @@ import org.isoron.uhabits.utils.toPaletteColor class ColorPickerDialog : ColorPickerDialog() { fun setListener(callback: OnColorPickedCallback) { super.setOnColorSelectedListener { c: Int -> - val pc = c.toPaletteColor(requireContext()) + val pc = c.toPaletteColor(context!!) callback.onColorPicked(pc) } } diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt index 27898e87f..cfa5c6e24 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/HistoryEditorDialog.kt @@ -51,12 +51,12 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener { override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { clearCurrentDialog() - val component = (requireActivity().application as HabitsApplication).component + val component = (activity!!.application as HabitsApplication).component commandRunner = component.commandRunner - habit = component.habitList.getById(requireArguments().getLong("habit"))!! + habit = component.habitList.getById(arguments!!.getLong("habit"))!! preferences = component.preferences - val themeSwitcher = AndroidThemeSwitcher(requireActivity(), preferences) + val themeSwitcher = AndroidThemeSwitcher(activity!!, preferences) themeSwitcher.apply() chart = HistoryChart( @@ -71,10 +71,10 @@ class HistoryEditorDialog : AppCompatDialogFragment(), CommandRunner.Listener { onDateClickedListener = onDateClickedListener ?: object : OnDateClickedListener {}, padding = 10.0, ) - dataView = AndroidDataView(requireContext(), null) + dataView = AndroidDataView(context!!, null) dataView.view = chart!! - val dialog = Dialog(requireContext()).apply { + val dialog = Dialog(context!!).apply { val metrics = resources.displayMetrics val maxHeight = resources.getDimensionPixelSize(R.dimen.history_editor_max_height) setContentView(dataView) diff --git a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt index a96cf1901..7e257ef38 100644 --- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt +++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/WeekdayPickerDialog.kt @@ -61,7 +61,7 @@ class WeekdayPickerDialog : override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { val builder = AlertDialog.Builder( - requireActivity() + activity!! ) builder .setTitle(R.string.select_weekdays)