Removing unrelated changes

Fixed double invocation of show() and target type dialog
Changed the approach, using an extension method
2025-12-06 09:08:52 -06:00 · 2022-08-14 12:24:44 +02:00 · 2022-08-14 01:30:02 +02:00 · 2022-08-14 01:09:36 +02:00 · 2022-08-13 18:25:49 +02:00 · 2022-08-13 18:21:13 +02:00
22 changed files with 101 additions and 91 deletions
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    val kotlinVersion = "1.7.10"
-    id("com.android.application") version ("7.3.0-rc01") apply (false)
+    val kotlinVersion = "1.6.10"
+    id("com.android.application") version ("7.0.3") apply (false)
    id("org.jetbrains.kotlin.android") version kotlinVersion apply (false)
    id("org.jetbrains.kotlin.kapt") version kotlinVersion apply (false)
    id("org.jetbrains.kotlin.android.extensions") version kotlinVersion apply (false)
    id("org.jetbrains.kotlin.multiplatform") version kotlinVersion apply (false)
-    id("org.jlleitschuh.gradle.ktlint") version "10.3.0"
+    id("org.jlleitschuh.gradle.ktlint") version "10.2.1"
 }

 apply {
--- a/docs/BUILD.md
+++ b/docs/BUILD.md
@@ -33,7 +33,7 @@ The repository will be downloaded to the directory `uhabits`.
 2. When the IDE asks you for the project location, select `uhabits` and click "Ok".
 3. Android Studio will spend some time indexing the project. When this is complete, click the toolbar icon "Sync Project with Gradle File", located near the right corner of the top toolbar.
 4. The operation will likely fail several times due to missing Android SDK components. Each time it fails, click the link "Install missing platforms", "Install build tools", etc, and try again.
-5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but feel free to customize the device.
+5. To test the application, create a virtual Android device using the menu "Tools" and "AVD Manager". The default options should work fine, but free to customize the device.
 6. Click the menu "Run" and "uhabits-android". The application should launch.


--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
--- a/uhabits-android/build.gradle.kts
+++ b/uhabits-android/build.gradle.kts
@@ -32,7 +32,7 @@ tasks.compileLint {

 android {

-    compileSdk = 32
+    compileSdk = 31

    defaultConfig {
        versionCode = 20100
@@ -68,6 +68,12 @@ android {
        }
    }

+    lint {
+        isCheckReleaseBuilds = false
+        isAbortOnError = false
+        disable("GoogleAppIndexingWarning")
+    }
+
    compileOptions {
        isCoreLibraryDesugaringEnabled = true
        targetCompatibility(JavaVersion.VERSION_1_8)
@@ -80,19 +86,19 @@ android {
 }

 dependencies {
-    val daggerVersion = "2.43.2"
-    val kotlinVersion = "1.7.10"
-    val kxCoroutinesVersion = "1.6.4"
+    val daggerVersion = "2.41"
+    val kotlinVersion = "1.6.21"
+    val kxCoroutinesVersion = "1.6.1"
    val ktorVersion = "1.6.8"
    val espressoVersion = "3.4.0"

    androidTestImplementation("androidx.test.espresso:espresso-contrib:$espressoVersion")
    androidTestImplementation("androidx.test.espresso:espresso-core:$espressoVersion")
    androidTestImplementation("com.google.dagger:dagger:$daggerVersion")
-    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.3")
+    androidTestImplementation("com.linkedin.dexmaker:dexmaker-mockito:2.28.1")
    androidTestImplementation("io.ktor:ktor-client-mock:$ktorVersion")
    androidTestImplementation("io.ktor:ktor-jackson:$ktorVersion")
-    androidTestImplementation("androidx.annotation:annotation:1.4.0")
+    androidTestImplementation("androidx.annotation:annotation:1.3.0")
    androidTestImplementation("androidx.test.ext:junit:1.1.3")
    androidTestImplementation("androidx.test.uiautomator:uiautomator:2.2.0")
    androidTestImplementation("androidx.test:rules:1.4.0")
@@ -110,10 +116,10 @@ dependencies {
    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$kxCoroutinesVersion")
    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$kxCoroutinesVersion")
-    implementation("androidx.appcompat:appcompat:1.5.0")
+    implementation("androidx.appcompat:appcompat:1.4.1")
    implementation("androidx.legacy:legacy-preference-v14:1.0.0")
    implementation("androidx.legacy:legacy-support-v4:1.0.0")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.5.0")
    implementation("com.opencsv:opencsv:5.6")
    implementation(project(":uhabits-core"))
    kapt("com.google.dagger:dagger-compiler:$daggerVersion")
--- a/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
+++ b/uhabits-android/src/androidTest/java/org/isoron/uhabits/acceptance/steps/ListHabitsSteps.kt
@@ -53,7 +53,6 @@ object ListHabitsSteps {
                clickViewWithId(R.id.action_filter)
                CommonSteps.clickText(R.string.hide_completed)
            }
-            else -> throw RuntimeException()
        }
        device.waitForIdle()
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkPopup.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/CheckmarkPopup.kt
@@ -26,6 +26,7 @@ import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.Entry.Companion.NO
 import org.isoron.uhabits.core.models.Entry.Companion.SKIP
 import org.isoron.uhabits.core.models.Entry.Companion.UNKNOWN
@@ -35,7 +36,6 @@ import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.InterfaceUtils.getFontAwesome
 import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.dp
 import org.isoron.uhabits.utils.sres

@@ -118,7 +118,8 @@ class CheckmarkPopup(
        view.unknownBtn.setOnClickListener { onClick(UNKNOWN) }
        dialog.setCanceledOnTouchOutside(true)
        dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
+        dialog.dismissCurrent()
+        dialog.show()
    }

    fun save() {
--- 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
@@ -18,7 +18,10 @@
 */
 package org.isoron.uhabits.activities.common.dialogs

+import android.app.Dialog
+import android.os.Bundle
 import com.android.colorpicker.ColorPickerDialog
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.ui.callbacks.OnColorPickedCallback
 import org.isoron.uhabits.utils.toPaletteColor

@@ -28,8 +31,14 @@ 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)
        }
    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val dialog = super.onCreateDialog(savedInstanceState)
+        dialog.dismissCurrent()
+        return dialog
+    }
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/ConfirmDeleteDialog.kt
@@ -22,6 +22,7 @@ import android.content.Context
 import android.content.DialogInterface
 import androidx.appcompat.app.AlertDialog
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.ui.callbacks.OnConfirmedCallback
 import org.isoron.uhabits.inject.ActivityContext

@@ -45,5 +46,7 @@ class ConfirmDeleteDialog(
            BUTTON_NEGATIVE,
            res.getString(R.string.no)
        ) { dialog: DialogInterface?, which: Int -> }
+
+        this.dismissCurrent()
    }
 }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/FrequencyPickerDialog.kt
@@ -31,6 +31,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import kotlinx.android.synthetic.main.frequency_picker_dialog.view.*
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent

 class FrequencyPickerDialog(
    var freqNumerator: Int,
@@ -111,10 +112,12 @@ class FrequencyPickerDialog(
            if (hasFocus) check(contentView.xTimesPerYDaysRadioButton)
        }

-        return AlertDialog.Builder(requireActivity())
+        val dialog = AlertDialog.Builder(requireActivity())
            .setView(contentView)
            .setPositiveButton(R.string.save) { _, _ -> onSaveClicked() }
            .create()
+        dialog.dismissCurrent()
+        return dialog
    }

    private fun addBeforeAfterText(
@@ -149,10 +152,8 @@ class FrequencyPickerDialog(
            }
            contentView.xTimesPerYDaysRadioButton.isChecked -> {
                if (contentView.xTimesPerYDaysXTextView.text.isNotEmpty() && contentView.xTimesPerYDaysYTextView.text.isNotEmpty()) {
-                    numerator =
-                        Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
-                    denominator =
-                        Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
+                    numerator = Integer.parseInt(contentView.xTimesPerYDaysXTextView.text.toString())
+                    denominator = Integer.parseInt(contentView.xTimesPerYDaysYTextView.text.toString())
                }
            }
            else -> {
--- 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)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/MultipleDialogsHandler.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/MultipleDialogsHandler.kt
@@ -0,0 +1,15 @@
+package org.isoron.uhabits.activities.common.dialogs
+
+import android.app.Dialog
+import java.lang.ref.WeakReference
+
+class MultipleDialogsHandler {
+    companion object {
+        var currentDialog: WeakReference<Dialog> = WeakReference(null)
+
+        fun Dialog.dismissCurrent() {
+            currentDialog.get()?.dismiss()
+            currentDialog = WeakReference(this)
+        }
+    }
+}
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPopup.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPopup.kt
@@ -27,11 +27,11 @@ import android.view.MotionEvent.ACTION_DOWN
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.Entry
 import org.isoron.uhabits.core.preferences.Preferences
 import org.isoron.uhabits.databinding.CheckmarkPopupBinding
 import org.isoron.uhabits.utils.dimBehind
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.dp
 import org.isoron.uhabits.utils.requestFocusWithKeyboard
 import java.text.DecimalFormat
@@ -104,7 +104,8 @@ class NumberPopup(
        view.value.requestFocusWithKeyboard()
        dialog.setCanceledOnTouchOutside(true)
        dialog.dimBehind()
-        dialog.dismissCurrentAndShow()
+        dialog.dismissCurrent()
+        dialog.show()
    }

    fun save() {
--- 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
@@ -25,6 +25,7 @@ import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatDialogFragment
 import org.isoron.uhabits.R
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.core.utils.DateUtils
 import java.util.Calendar
@@ -60,7 +61,7 @@ class WeekdayPickerDialog :

    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
        val builder = AlertDialog.Builder(
-            requireActivity()
+            activity!!
        )
        builder
            .setTitle(R.string.select_weekdays)
@@ -74,7 +75,9 @@ class WeekdayPickerDialog :
                android.R.string.cancel
            ) { _: DialogInterface?, _: Int -> dismiss() }

-        return builder.create()
+        val dialog = builder.create()
+        dialog.dismissCurrent()
+        return dialog
    }

    fun setListener(listener: OnWeekdaysPickedListener?) {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/EditHabitActivity.kt
@@ -46,6 +46,7 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.AndroidThemeSwitcher
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.FrequencyPickerDialog
+import org.isoron.uhabits.activities.common.dialogs.MultipleDialogsHandler.Companion.dismissCurrent
 import org.isoron.uhabits.activities.common.dialogs.WeekdayPickerDialog
 import org.isoron.uhabits.core.commands.CommandRunner
 import org.isoron.uhabits.core.commands.CreateHabitCommand
@@ -59,7 +60,6 @@ import org.isoron.uhabits.core.models.Reminder
 import org.isoron.uhabits.core.models.WeekdayList
 import org.isoron.uhabits.databinding.ActivityEditHabitBinding
 import org.isoron.uhabits.utils.ColorUtils
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.formatTime
 import org.isoron.uhabits.utils.toFormattedString

@@ -157,23 +157,23 @@ class EditHabitActivity : AppCompatActivity() {

        val colorPickerDialogFactory = ColorPickerDialogFactory(this)
        binding.colorButton.setOnClickListener {
-            val picker = colorPickerDialogFactory.create(color, themeSwitcher.currentTheme)
-            picker.setListener { paletteColor ->
+            val dialog = colorPickerDialogFactory.create(color, themeSwitcher.currentTheme)
+            dialog.setListener { paletteColor ->
                this.color = paletteColor
                updateColors()
            }
-            picker.dismissCurrentAndShow(supportFragmentManager, "colorPicker")
+            dialog.show(supportFragmentManager, "colorPicker")
        }

        populateFrequency()
        binding.booleanFrequencyPicker.setOnClickListener {
-            val picker = FrequencyPickerDialog(freqNum, freqDen)
-            picker.onFrequencyPicked = { num, den ->
+            val dialog = FrequencyPickerDialog(freqNum, freqDen)
+            dialog.onFrequencyPicked = { num, den ->
                freqNum = num
                freqDen = den
                populateFrequency()
            }
-            picker.dismissCurrentAndShow(supportFragmentManager, "frequencyPicker")
+            dialog.show(supportFragmentManager, "frequencyPicker")
        }

        populateTargetType()
@@ -191,7 +191,8 @@ class EditHabitActivity : AppCompatActivity() {
                dialog.dismiss()
            }
            val dialog = builder.create()
-            dialog.dismissCurrentAndShow()
+            dialog.dismissCurrent()
+            dialog.show()
        }

        binding.numericalFrequencyPicker.setOnClickListener {
@@ -237,7 +238,7 @@ class EditHabitActivity : AppCompatActivity() {
                is24HourMode,
                androidColor
            )
-            dialog.dismissCurrentAndShow(supportFragmentManager, "timePicker")
+            dialog.show(supportFragmentManager, "timePicker")
        }

        binding.reminderDatePicker.setOnClickListener {
@@ -249,7 +250,7 @@ class EditHabitActivity : AppCompatActivity() {
                populateReminder()
            }
            dialog.setSelectedDays(reminderDays)
-            dialog.dismissCurrentAndShow(supportFragmentManager, "dayPicker")
+            dialog.show(supportFragmentManager, "dayPicker")
        }

        binding.buttonSave.setOnClickListener {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/edit/HabitTypeDialog.kt
@@ -40,13 +40,13 @@ class HabitTypeDialog : AppCompatDialogFragment() {
        val binding = SelectHabitTypeBinding.inflate(inflater, container, false)

        binding.buttonYesNo.setOnClickListener {
-            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.YES_NO.value)
+            val intent = IntentFactory().startEditActivity(activity!!, HabitType.YES_NO.value)
            startActivity(intent)
            dismiss()
        }

        binding.buttonMeasurable.setOnClickListener {
-            val intent = IntentFactory().startEditActivity(requireActivity(), HabitType.NUMERICAL.value)
+            val intent = IntentFactory().startEditActivity(activity!!, HabitType.NUMERICAL.value)
            startActivity(intent)
            dismiss()
        }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsActivity.kt
@@ -21,7 +21,6 @@ package org.isoron.uhabits.activities.habits.list

 import android.content.Intent
 import android.os.Bundle
-import android.util.Log
 import android.view.Menu
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
@@ -101,11 +100,7 @@ class ListHabitsActivity : AppCompatActivity(), Preferences.Listener {
        rootView.postInvalidate()
        midnightTimer.onResume()
        taskRunner.run {
-            try {
-                AutoBackup(this@ListHabitsActivity).run()
-            } catch (e: Exception) {
-                Log.e("ListHabitActivity", "AutoBackup task failed", e)
-            }
+            AutoBackup(this@ListHabitsActivity).run()
        }
        if (prefs.theme == THEME_DARK && prefs.isPureBlackEnabled != pureBlack) {
            restartWithFade(ListHabitsActivity::class.java)
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt
@@ -64,7 +64,6 @@ import org.isoron.uhabits.tasks.ImportDataTask
 import org.isoron.uhabits.tasks.ImportDataTaskFactory
 import org.isoron.uhabits.utils.copyTo
 import org.isoron.uhabits.utils.currentTheme
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.restartWithFade
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendEmailScreen
@@ -164,7 +163,7 @@ class ListHabitsScreen
    }

    override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback, quantity: Int) {
-        ConfirmDeleteDialog(activity, callback, quantity).dismissCurrentAndShow()
+        ConfirmDeleteDialog(activity, callback, quantity).show()
    }

    override fun showEditHabitsScreen(selected: List<Habit>) {
@@ -225,7 +224,7 @@ class ListHabitsScreen
    override fun showColorPicker(defaultColor: PaletteColor, callback: OnColorPickedCallback) {
        val picker = colorPickerFactory.create(defaultColor, themeSwitcher.currentTheme!!)
        picker.setListener(callback)
-        picker.dialog?.dismissCurrentAndShow()
+        picker.show(activity.supportFragmentManager, "picker")
    }

    override fun showNumberPopup(
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt
@@ -50,7 +50,6 @@ import org.isoron.uhabits.core.ui.screens.habits.show.ShowHabitPresenter
 import org.isoron.uhabits.core.ui.views.OnDateClickedListener
 import org.isoron.uhabits.intents.IntentFactory
 import org.isoron.uhabits.utils.currentTheme
-import org.isoron.uhabits.utils.dismissCurrentAndShow
 import org.isoron.uhabits.utils.showMessage
 import org.isoron.uhabits.utils.showSendFileScreen
 import org.isoron.uhabits.widgets.WidgetUpdater
@@ -221,7 +220,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
                ShowHabitMenuPresenter.Message.COULD_NOT_EXPORT -> {
                    showMessage(resources.getString(R.string.could_not_export))
                }
-                else -> {}
            }
        }

@@ -230,7 +228,7 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
        }

        override fun showDeleteConfirmationScreen(callback: OnConfirmedCallback) {
-            ConfirmDeleteDialog(this@ShowHabitActivity, callback, 1).dismissCurrentAndShow()
+            ConfirmDeleteDialog(this@ShowHabitActivity, callback, 1).show()
        }

        override fun close() {
--- a/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/activities/settings/SettingsFragment.kt
@@ -65,7 +65,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
        addPreferencesFromResource(R.xml.preferences)
-        val appContext = requireContext().applicationContext
+        val appContext = context!!.applicationContext
        if (appContext is HabitsApplication) {
            prefs = appContext.component.preferences
            widgetUpdater = appContext.component.widgetUpdater
@@ -99,9 +99,9 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
            return true
        } else if (key == "reminderCustomize") {
            if (SDK_INT < Build.VERSION_CODES.O) return true
-            createAndroidNotificationChannel(requireContext())
+            createAndroidNotificationChannel(context!!)
            val intent = Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-            intent.putExtra(Settings.EXTRA_APP_PACKAGE, requireContext().packageName)
+            intent.putExtra(Settings.EXTRA_APP_PACKAGE, context!!.packageName)
            intent.putExtra(Settings.EXTRA_CHANNEL_ID, NotificationTray.REMINDERS_CHANNEL_ID)
            startActivity(intent)
            return true
@@ -111,7 +111,7 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis

    override fun onResume() {
        super.onResume()
-        ringtoneManager = RingtoneManager(requireActivity())
+        ringtoneManager = RingtoneManager(activity!!)
        sharedPrefs = preferenceManager.sharedPreferences
        sharedPrefs!!.registerOnSharedPreferenceChangeListener(this)
        if (!prefs.isDeveloper) {
@@ -154,8 +154,8 @@ class SettingsFragment : PreferenceFragmentCompat(), OnSharedPreferenceChangeLis
        val pref = findPreference(key)
        pref.onPreferenceClickListener =
            Preference.OnPreferenceClickListener {
-                requireActivity().setResult(result)
-                requireActivity().finish()
+                activity!!.setResult(result)
+                activity!!.finish()
                true
            }
    }
--- a/uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt
+++ b/uhabits-android/src/main/java/org/isoron/uhabits/utils/DialogUtils.kt
@@ -1,21 +0,0 @@
-package org.isoron.uhabits.utils
-
-import android.app.Dialog
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentManager
-import java.lang.ref.WeakReference
-
-var currentDialog: WeakReference<Dialog> = WeakReference(null)
-
-fun Dialog.dismissCurrentAndShow() {
-    currentDialog.get()?.dismiss()
-    currentDialog = WeakReference(this)
-    show()
-}
-
-fun DialogFragment.dismissCurrentAndShow(fragmentManager: FragmentManager, tag: String) {
-    currentDialog.get()?.dismiss()
-    show(fragmentManager, tag)
-    fragmentManager.executePendingTransactions()
-    currentDialog = WeakReference(this.dialog)
-}
--- a/uhabits-core/build.gradle.kts
+++ b/uhabits-core/build.gradle.kts
@@ -43,11 +43,11 @@ kotlin {
        val jvmMain by getting {
            dependencies {
                implementation(kotlin("stdlib-jdk8"))
-                compileOnly("com.google.dagger:dagger:2.43.2")
+                compileOnly("com.google.dagger:dagger:2.41")
                implementation("com.google.guava:guava:31.1-android")
-                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.7.10")
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4")
-                implementation("androidx.annotation:annotation:1.4.0")
+                implementation("org.jetbrains.kotlin:kotlin-stdlib:1.6.21")
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.1")
+                implementation("androidx.annotation:annotation:1.3.0")
                implementation("com.google.code.findbugs:jsr305:3.0.2")
                implementation("com.opencsv:opencsv:5.6")
                implementation("commons-codec:commons-codec:1.15")
@@ -59,7 +59,7 @@ kotlin {
            dependencies {
                implementation(kotlin("test"))
                implementation(kotlin("test-junit"))
-                implementation("org.xerial:sqlite-jdbc:3.39.2.0")
+                implementation("org.xerial:sqlite-jdbc:3.36.0.3")
                implementation("org.hamcrest:hamcrest:2.2")
                implementation("org.apache.commons:commons-io:1.3.2")
                implementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
--- a/uhabits-server/build.gradle.kts
+++ b/uhabits-server/build.gradle.kts
@@ -34,7 +34,7 @@ application {

 dependencies {
    val ktorVersion = "1.6.8"
-    val kotlinVersion = "1.7.10"
+    val kotlinVersion = "1.6.21"
    val logbackVersion = "1.2.11"
    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion")
    implementation("io.ktor:ktor-server-netty:$ktorVersion")
@@ -43,9 +43,9 @@ dependencies {
    implementation("io.ktor:ktor-html-builder:$ktorVersion")
    implementation("io.ktor:ktor-jackson:$ktorVersion")
    implementation("org.jetbrains:kotlin-css-jvm:1.0.0-pre.148-kotlin-1.4.30")
-    implementation("io.prometheus:simpleclient:0.16.0")
-    implementation("io.prometheus:simpleclient_httpserver:0.16.0")
-    implementation("io.prometheus:simpleclient_hotspot:0.16.0")
+    implementation("io.prometheus:simpleclient:0.15.0")
+    implementation("io.prometheus:simpleclient_httpserver:0.15.0")
+    implementation("io.prometheus:simpleclient_hotspot:0.15.0")
    testImplementation("io.ktor:ktor-server-tests:$ktorVersion")
    testImplementation("com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0")
    testImplementation(kotlin("test"))
Author	SHA1	Message	Date
Jakub Kalinowski	e189d17fd5	Removing unrelated changes	2022-08-14 12:24:44 +02:00
Jakub Kalinowski	30c39853e9	Fixed double invocation of show() and target type dialog	2022-08-14 01:30:02 +02:00
Jakub Kalinowski	c1fa6c46ee	Changed the approach, using an extension method	2022-08-14 01:09:36 +02:00
Jakub Kalinowski	6e4ed3837f	One last ktlint problem	2022-08-13 18:25:49 +02:00
Jakub Kalinowski	cb65604581	Code style fixes	2022-08-13 18:21:13 +02:00
Jakub Kalinowski	2db4491328	Handling multiple dialogs correctly	2022-08-13 18:16:11 +02:00
Jakub Kalinowski	25a3509988	Reimplementing the multiple popups handling in the new popup solution.	2022-08-13 14:39:01 +02:00