forked from penguin86/luna-tracker
		
	simplify puke event
This commit is contained in:
		@@ -260,26 +260,6 @@ class MainActivity : AppCompatActivity() {
 | 
				
			|||||||
        alertDialog.show()
 | 
					        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<Spinner>(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) {
 | 
					    fun askNotes(lunaEvent: LunaEvent) {
 | 
				
			||||||
        val d = AlertDialog.Builder(this)
 | 
					        val d = AlertDialog.Builder(this)
 | 
				
			||||||
        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
 | 
					        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
 | 
				
			||||||
@@ -808,7 +788,7 @@ class MainActivity : AppCompatActivity() {
 | 
				
			|||||||
                dismiss()
 | 
					                dismiss()
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
            contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
 | 
					            contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
 | 
				
			||||||
                askPukeValue()
 | 
					                logEvent(LunaEvent(LunaEvent.TYPE_PUKE))
 | 
				
			||||||
                dismiss()
 | 
					                dismiss()
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
 | 
					            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -66,8 +66,6 @@ class NumericUtils (val context: Context) {
 | 
				
			|||||||
            formatted.append(when (item.type) {
 | 
					            formatted.append(when (item.type) {
 | 
				
			||||||
                LunaEvent.TYPE_TEMPERATURE ->
 | 
					                LunaEvent.TYPE_TEMPERATURE ->
 | 
				
			||||||
                    (item.quantity / 10.0f).toString()
 | 
					                    (item.quantity / 10.0f).toString()
 | 
				
			||||||
                LunaEvent.TYPE_PUKE ->
 | 
					 | 
				
			||||||
                    context.resources.getStringArray(R.array.AmountLabels)[item.quantity]
 | 
					 | 
				
			||||||
                else ->
 | 
					                else ->
 | 
				
			||||||
                    item.quantity
 | 
					                    item.quantity
 | 
				
			||||||
            })
 | 
					            })
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,17 +0,0 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					 | 
				
			||||||
<LinearLayout
 | 
					 | 
				
			||||||
    xmlns:android="http://schemas.android.com/apk/res/android"
 | 
					 | 
				
			||||||
    android:layout_width="match_parent"
 | 
					 | 
				
			||||||
    android:layout_height="match_parent"
 | 
					 | 
				
			||||||
    android:layout_gravity="center"
 | 
					 | 
				
			||||||
    android:gravity="center"
 | 
					 | 
				
			||||||
    android:orientation="vertical">
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <Spinner
 | 
					 | 
				
			||||||
        android:id="@+id/dialog_puke_value"
 | 
					 | 
				
			||||||
        android:layout_width="250dp"
 | 
					 | 
				
			||||||
        android:layout_height="wrap_content"
 | 
					 | 
				
			||||||
        android:paddingHorizontal="16dp"
 | 
					 | 
				
			||||||
        android:paddingVertical="8dp"/>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
</LinearLayout>
 | 
					 | 
				
			||||||
@@ -1,8 +0,0 @@
 | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?>
 | 
					 | 
				
			||||||
<resources>
 | 
					 | 
				
			||||||
    <string-array name="AmountLabels">
 | 
					 | 
				
			||||||
        <item>@string/amount_low</item>
 | 
					 | 
				
			||||||
        <item>@string/amount_normal</item>
 | 
					 | 
				
			||||||
        <item>@string/amount_high</item>
 | 
					 | 
				
			||||||
    </string-array>
 | 
					 | 
				
			||||||
</resources>
 | 
					 | 
				
			||||||
@@ -12,9 +12,6 @@
 | 
				
			|||||||
    <string name="log_temperature_dialog_title">Temperature</string>
 | 
					    <string name="log_temperature_dialog_title">Temperature</string>
 | 
				
			||||||
    <string name="log_temperature_dialog_description">Insert the temperature</string>
 | 
					    <string name="log_temperature_dialog_description">Insert the temperature</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <string name="log_puke_dialog_title">Puke</string>
 | 
					 | 
				
			||||||
    <string name="log_puke_dialog_description">Select the amount</string>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <string name="event_bottle_type" translatable="false">🍼</string>
 | 
					    <string name="event_bottle_type" translatable="false">🍼</string>
 | 
				
			||||||
    <string name="event_food_type" translatable="false">🥣</string>
 | 
					    <string name="event_food_type" translatable="false">🥣</string>
 | 
				
			||||||
    <string name="event_scale_type" translatable="false">⚖️</string>
 | 
					    <string name="event_scale_type" translatable="false">⚖️</string>
 | 
				
			||||||
@@ -72,10 +69,6 @@
 | 
				
			|||||||
    <string name="year_ago">year</string>
 | 
					    <string name="year_ago">year</string>
 | 
				
			||||||
    <string name="years_ago">years</string>
 | 
					    <string name="years_ago">years</string>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    <string name="amount_low">Little</string>
 | 
					 | 
				
			||||||
    <string name="amount_normal">-</string>
 | 
					 | 
				
			||||||
    <string name="amount_high">A Lot</string>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    <string name="no_connection">No connection</string>
 | 
					    <string name="no_connection">No connection</string>
 | 
				
			||||||
    <string name="no_connection_explain">Unable to reach WebDAV service</string>
 | 
					    <string name="no_connection_explain">Unable to reach WebDAV service</string>
 | 
				
			||||||
    <string name="no_connection_go_to_settings">Settings</string>
 | 
					    <string name="no_connection_go_to_settings">Settings</string>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user