diff --git a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt index 30699d1..28711ac 100644 --- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt +++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt @@ -260,26 +260,6 @@ class MainActivity : AppCompatActivity() { alertDialog.show() } - fun askPukeValue() { - val d = AlertDialog.Builder(this) - val dialogView = layoutInflater.inflate(R.layout.puke_dialog, null) - d.setTitle(R.string.log_puke_dialog_title) - d.setMessage(R.string.log_puke_dialog_description) - d.setView(dialogView) - - val spinner = dialogView.findViewById(R.id.dialog_puke_value) - spinner.adapter = ArrayAdapter.createFromResource(this, R.array.AmountLabels, android.R.layout.simple_spinner_dropdown_item) - spinner.setSelection(1) - - d.setPositiveButton(android.R.string.ok) { dialogInterface, i -> - val pos = spinner.selectedItemPosition - logEvent(LunaEvent(LunaEvent.TYPE_PUKE, pos)) - } - d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() } - val alertDialog = d.create() - alertDialog.show() - } - fun askNotes(lunaEvent: LunaEvent) { val d = AlertDialog.Builder(this) val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null) @@ -808,7 +788,7 @@ class MainActivity : AppCompatActivity() { dismiss() }) contentView.findViewById(R.id.button_puke).setOnClickListener({ - askPukeValue() + askNotes(LunaEvent(LunaEvent.TYPE_PUKE)) dismiss() }) contentView.findViewById(R.id.button_colic).setOnClickListener({ diff --git a/app/src/main/java/utils/NumericUtils.kt b/app/src/main/java/utils/NumericUtils.kt index 73b95bc..f933c24 100644 --- a/app/src/main/java/utils/NumericUtils.kt +++ b/app/src/main/java/utils/NumericUtils.kt @@ -66,8 +66,6 @@ class NumericUtils (val context: Context) { formatted.append(when (item.type) { LunaEvent.TYPE_TEMPERATURE -> (item.quantity / 10.0f).toString() - LunaEvent.TYPE_PUKE -> - context.resources.getStringArray(R.array.AmountLabels)[item.quantity] else -> item.quantity }) diff --git a/app/src/main/res/layout/puke_dialog.xml b/app/src/main/res/layout/puke_dialog.xml deleted file mode 100644 index 6f924a0..0000000 --- a/app/src/main/res/layout/puke_dialog.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml deleted file mode 100644 index 1abb5c6..0000000 --- a/app/src/main/res/values/arrays.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - @string/amount_low - @string/amount_normal - @string/amount_high - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f04959e..7f78262 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -12,9 +12,6 @@ Temperature Insert the temperature - Puke - Select the amount - 🍼 🥣 ⚖️ @@ -72,10 +69,6 @@ year years - Little - - - A Lot - No connection Unable to reach WebDAV service Settings