Remove previous NumberPicker

uhabits-android/src/main/java/org/isoron/uhabits/activities/common/dialogs/NumberPickerFactory.kt

@@ -1,205 +0,0 @@
-/*
- * Copyright (C) 2016-2021 Álinson Santos Xavier <git@axavier.org>
- *
- * This file is part of Loop Habit Tracker.
- *
- * Loop Habit Tracker is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- *
- * Loop Habit Tracker is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
- * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.isoron.uhabits.activities.common.dialogs
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.DialogInterface
-import android.content.DialogInterface.BUTTON_NEGATIVE
-import android.text.InputFilter
-import android.text.Spanned
-import android.view.LayoutInflater
-import android.view.View
-import android.view.WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
-import android.view.inputmethod.EditorInfo
-import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
-import android.widget.NumberPicker
-import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
-import org.isoron.uhabits.HabitsApplication
-import org.isoron.uhabits.R
-import org.isoron.uhabits.core.models.Entry
-import org.isoron.uhabits.core.models.Frequency
-import org.isoron.uhabits.core.models.Frequency.Companion.DAILY
-import org.isoron.uhabits.core.ui.screens.habits.list.ListHabitsBehavior
-import org.isoron.uhabits.inject.ActivityContext
-import org.isoron.uhabits.utils.InterfaceUtils
-import java.text.DecimalFormatSymbols
-import javax.inject.Inject
-import kotlin.math.roundToLong
-
-class NumberPickerFactory
-@Inject constructor(
-    @ActivityContext private val context: Context
-) {
-    @SuppressLint("SetTextI18n")
-    fun create(
-        value: Double,
-        unit: String,
-        notes: String,
-        dateString: String,
-        frequency: Frequency,
-        callback: ListHabitsBehavior.NumberPickerCallback
-    ): AlertDialog {
-        clearCurrentDialog()
-
-        val inflater = LayoutInflater.from(context)
-        val view = inflater.inflate(R.layout.number_picker_dialog, null)
-
-        val picker = view.findViewById<NumberPicker>(R.id.picker)
-        val picker2 = view.findViewById<NumberPicker>(R.id.picker2)
-        val etNotes = view.findViewById<EditText>(R.id.etNotes)
-
-        // Install filter to intercept decimal separator before it is parsed
-        val watcherFilter: InputFilter = SeparatorWatcherInputFilter(picker2)
-        val pickerInputText = getNumberPickerInputText(picker)
-        pickerInputText.filters = arrayOf(watcherFilter).plus(pickerInputText.filters)
-
-        // Install custom focus listener to replace "5" by "50" instead of "05"
-        val picker2InputText = getNumberPickerInputText(picker2)
-        val prevFocusChangeListener = picker2InputText.onFocusChangeListener
-        picker2InputText.onFocusChangeListener = View.OnFocusChangeListener { v, hasFocus ->
-            val str = picker2InputText.text.toString()
-            if (str.length == 1) picker2InputText.setText("${str}0")
-            prevFocusChangeListener.onFocusChange(v, hasFocus)
-        }
-
-        view.findViewById<TextView>(R.id.tvUnit).text = unit
-        view.findViewById<TextView>(R.id.tvSeparator).text =
-            DecimalFormatSymbols.getInstance().decimalSeparator.toString()
-
-        val intValue = (value * 100).roundToLong().toInt()
-
-        picker.minValue = 0
-        picker.maxValue = Integer.MAX_VALUE / 100
-        picker.value = intValue / 100
-        picker.wrapSelectorWheel = false
-
-        picker2.minValue = 0
-        picker2.maxValue = 99
-        picker2.setFormatter { v -> String.format("%02d", v) }
-        picker2.value = intValue % 100
-
-        etNotes.setText(notes)
-        val dialogBuilder = AlertDialog.Builder(context)
-            .setView(view)
-            .setTitle(dateString)
-            .setPositiveButton(R.string.save) { _, _ ->
-                picker.clearFocus()
-                picker2.clearFocus()
-                val v = picker.value + 0.01 * picker2.value
-                val note = etNotes.text.toString().trim()
-                callback.onNumberPicked(v, note)
-            }
-            .setNegativeButton(android.R.string.cancel) { _, _ ->
-                callback.onNumberPickerDismissed()
-            }
-            .setOnDismissListener {
-                callback.onNumberPickerDismissed()
-                currentDialog = null
-            }
-
-        if (frequency == DAILY) {
-            dialogBuilder.setNegativeButton(R.string.skip_day) { _, _ ->
-                picker.clearFocus()
-                val v = Entry.SKIP.toDouble() / 1000
-                val note = etNotes.text.toString()
-                callback.onNumberPicked(v, note)
-            }
-        }
-
-        val dialog = dialogBuilder.create()
-
-        dialog.setOnShowListener {
-            val preferences =
-                (context.applicationContext as HabitsApplication).component.preferences
-            if (!preferences.isSkipEnabled) {
-                dialog.getButton(BUTTON_NEGATIVE).visibility = View.GONE
-            }
-            showSoftInput(dialog, pickerInputText)
-        }
-
-        InterfaceUtils.setupEditorAction(
-            picker
-        ) { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
-            }
-            false
-        }
-
-        InterfaceUtils.setupEditorAction(
-            picker2
-        ) { _, actionId, _ ->
-            if (actionId == EditorInfo.IME_ACTION_DONE) {
-                dialog.getButton(DialogInterface.BUTTON_POSITIVE).performClick()
-            }
-            false
-        }
-
-        currentDialog = dialog
-        return dialog
-    }
-
-    @SuppressLint("DiscouragedPrivateApi")
-    private fun getNumberPickerInputText(picker: NumberPicker): EditText {
-        val f = NumberPicker::class.java.getDeclaredField("mInputText")
-        f.isAccessible = true
-        return f.get(picker) as EditText
-    }
-
-    private fun showSoftInput(dialog: AlertDialog, v: View) {
-        dialog.window?.setSoftInputMode(SOFT_INPUT_STATE_ALWAYS_VISIBLE)
-        v.requestFocus()
-        val inputMethodManager = context.getSystemService(InputMethodManager::class.java)
-        inputMethodManager?.showSoftInput(v, 0)
-    }
-
-    companion object {
-        private var currentDialog: AlertDialog? = null
-        fun clearCurrentDialog() {
-            currentDialog?.dismiss()
-            currentDialog = null
-        }
-    }
-}
-
-class SeparatorWatcherInputFilter(private val nextPicker: NumberPicker) : InputFilter {
-    override fun filter(
-        source: CharSequence?,
-        start: Int,
-        end: Int,
-        dest: Spanned?,
-        dstart: Int,
-        dend: Int
-    ): CharSequence {
-        if (source == null || source.isEmpty()) {
-            return ""
-        }
-        for (c in source) {
-            if (c == DecimalFormatSymbols.getInstance().decimalSeparator || c == '.' || c == ',') {
-                nextPicker.performLongClick()
-                break
-            }
-        }
-        return source
-    }
-}

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/list/ListHabitsScreen.kt

@@ -30,7 +30,6 @@ import org.isoron.uhabits.R
 import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ColorPickerDialogFactory
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
-import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.activities.common.dialogs.NumberPopup
 import org.isoron.uhabits.activities.common.dialogs.POPUP_WIDTH
 import org.isoron.uhabits.activities.habits.edit.HabitTypeDialog
@@ -43,7 +42,6 @@ import org.isoron.uhabits.core.commands.CreateHabitCommand
 import org.isoron.uhabits.core.commands.DeleteHabitsCommand
 import org.isoron.uhabits.core.commands.EditHabitCommand
 import org.isoron.uhabits.core.commands.UnarchiveHabitsCommand
-import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.preferences.Preferences
@@ -96,7 +94,6 @@ class ListHabitsScreen
     private val exportDBFactory: ExportDBTaskFactory,
     private val importTaskFactory: ImportDataTaskFactory,
     private val colorPickerFactory: ColorPickerDialogFactory,
-    private val numberPickerFactory: NumberPickerFactory,
     private val behavior: Lazy<ListHabitsBehavior>,
     private val preferences: Preferences,
     private val rootView: Lazy<ListHabitsRootView>,
@@ -232,17 +229,6 @@ class ListHabitsScreen
         picker.show(activity.supportFragmentManager, "picker")
     }
 
-    override fun showNumberPicker(
-        value: Double,
-        unit: String,
-        notes: String,
-        dateString: String,
-        frequency: Frequency,
-        callback: ListHabitsBehavior.NumberPickerCallback
-    ) {
-        numberPickerFactory.create(value, unit, notes, dateString, frequency, callback).show()
-    }
-
     override fun showNumberPopup(
         value: Double,
         notes: String,

uhabits-android/src/main/java/org/isoron/uhabits/activities/habits/show/ShowHabitActivity.kt

@@ -38,12 +38,10 @@ import org.isoron.uhabits.activities.HabitsDirFinder
 import org.isoron.uhabits.activities.common.dialogs.CheckmarkPopup
 import org.isoron.uhabits.activities.common.dialogs.ConfirmDeleteDialog
 import org.isoron.uhabits.activities.common.dialogs.HistoryEditorDialog
-import org.isoron.uhabits.activities.common.dialogs.NumberPickerFactory
 import org.isoron.uhabits.activities.common.dialogs.NumberPopup
 import org.isoron.uhabits.activities.common.dialogs.POPUP_WIDTH
 import org.isoron.uhabits.core.commands.Command
 import org.isoron.uhabits.core.commands.CommandRunner
-import org.isoron.uhabits.core.models.Frequency
 import org.isoron.uhabits.core.models.Habit
 import org.isoron.uhabits.core.models.PaletteColor
 import org.isoron.uhabits.core.preferences.Preferences
@@ -171,24 +169,6 @@ class ShowHabitActivity : AppCompatActivity(), CommandRunner.Listener {
             window.decorView.performHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY)
         }
 
-        override fun showNumberPicker(
-            value: Double,
-            unit: String,
-            notes: String,
-            dateString: String,
-            frequency: Frequency,
-            callback: ListHabitsBehavior.NumberPickerCallback
-        ) {
-            NumberPickerFactory(this@ShowHabitActivity).create(
-                value,
-                unit,
-                notes,
-                dateString,
-                frequency,
-                callback
-            ).show()
-        }
-
         override fun showNumberPopup(
             value: Double,
             notes: String,

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/list/ListHabitsBehavior.kt

@@ -156,14 +156,6 @@ open class ListHabitsBehavior @Inject constructor(
         fun showHabitScreen(h: Habit)
         fun showIntroScreen()
         fun showMessage(m: Message)
-        fun showNumberPicker(
-            value: Double,
-            unit: String,
-            notes: String,
-            dateString: String,
-            frequency: Frequency,
-            callback: NumberPickerCallback
-        )
         fun showNumberPopup(
             value: Double,
             notes: String,

uhabits-core/src/jvmMain/java/org/isoron/uhabits/core/ui/screens/habits/show/views/HistoryCard.kt

@@ -204,14 +204,6 @@ class HistoryCardPresenter(
     interface Screen {
         fun showHistoryEditorDialog(listener: OnDateClickedListener)
         fun showFeedback()
-        fun showNumberPicker(
-            value: Double,
-            unit: String,
-            notes: String,
-            dateString: String,
-            frequency: Frequency,
-            callback: ListHabitsBehavior.NumberPickerCallback
-        )
         fun showNumberPopup(
             value: Double,
             notes: String,