forked from penguin86/luna-tracker
		
	Compare commits
	
		
			8 Commits
		
	
	
		
			master
			...
			ce349fe1cf
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| ce349fe1cf | |||
| 6fcc685b6e | |||
| 301e8d0476 | |||
| 0633b4d084 | |||
| 0a9821aef7 | |||
| 01f24694b5 | |||
| 693405cadb | |||
| 730ef95220 | 
@@ -41,7 +41,6 @@ import okio.IOException
 | 
			
		||||
import org.json.JSONException
 | 
			
		||||
import utils.DateUtils
 | 
			
		||||
import utils.NumericUtils
 | 
			
		||||
import java.text.DateFormat
 | 
			
		||||
import java.util.Calendar
 | 
			
		||||
import java.util.Date
 | 
			
		||||
 | 
			
		||||
@@ -58,6 +57,7 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
    lateinit var buttonsContainer: ViewGroup
 | 
			
		||||
    lateinit var recyclerView: RecyclerView
 | 
			
		||||
    lateinit var handler: Handler
 | 
			
		||||
    var signature = ""
 | 
			
		||||
    var savingEvent = false
 | 
			
		||||
    val updateListRunnable: Runnable = Runnable {
 | 
			
		||||
        if (logbook != null && !pauseLogbookUpdate)
 | 
			
		||||
@@ -169,6 +169,8 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
            logbookRepo = FileLogbookRepository()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        signature = settingsRepository.loadSignature()
 | 
			
		||||
 | 
			
		||||
        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
 | 
			
		||||
        findViewById<View>(R.id.layout_nipples).visibility = when (noBreastfeeding) {
 | 
			
		||||
            true -> View.GONE
 | 
			
		||||
@@ -340,7 +342,6 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
    fun showEventDetailDialog(event: LunaEvent, items: ArrayList<LunaEvent>) {
 | 
			
		||||
        // Do not update list while the detail is shown, to avoid changing the object below while it is changed by the user
 | 
			
		||||
        pauseLogbookUpdate = true
 | 
			
		||||
        val dateFormat = DateFormat.getDateTimeInstance()
 | 
			
		||||
        val d = AlertDialog.Builder(this)
 | 
			
		||||
        d.setTitle(R.string.dialog_event_detail_title)
 | 
			
		||||
        val dialogView = layoutInflater.inflate(R.layout.dialog_event_detail, null)
 | 
			
		||||
@@ -352,8 +353,9 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
 | 
			
		||||
        val currentDateTime = Calendar.getInstance()
 | 
			
		||||
        currentDateTime.time = Date(event.time * 1000)
 | 
			
		||||
 | 
			
		||||
        val dateTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date)
 | 
			
		||||
        dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), dateFormat.format(currentDateTime.time))
 | 
			
		||||
        dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
 | 
			
		||||
        dateTextView.setOnClickListener {
 | 
			
		||||
            // Show datetime picker
 | 
			
		||||
            val startYear = currentDateTime.get(Calendar.YEAR)
 | 
			
		||||
@@ -366,11 +368,9 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
                TimePickerDialog(this, { _, hour, minute ->
 | 
			
		||||
                    val pickedDateTime = Calendar.getInstance()
 | 
			
		||||
                    pickedDateTime.set(year, month, day, hour, minute)
 | 
			
		||||
                    currentDateTime.time = pickedDateTime.time
 | 
			
		||||
                    dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), dateFormat.format(currentDateTime.time))
 | 
			
		||||
 | 
			
		||||
                    // Save event and move it to the right position in the logbook
 | 
			
		||||
                    event.time = currentDateTime.time.time / 1000 // Seconds since epoch
 | 
			
		||||
                    event.time = pickedDateTime.time.time / 1000 // Seconds since epoch
 | 
			
		||||
                    dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), DateUtils.formatDateTime(event.time))
 | 
			
		||||
                    logbook?.sort()
 | 
			
		||||
                    recyclerView.adapter?.notifyDataSetChanged()
 | 
			
		||||
                    saveLogbook()
 | 
			
		||||
@@ -389,6 +389,13 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
            pauseLogbookUpdate = false
 | 
			
		||||
        })
 | 
			
		||||
 | 
			
		||||
        // show optional signature
 | 
			
		||||
        if (event.signature.isNotEmpty()) {
 | 
			
		||||
            val signatureTextEdit = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_signature)
 | 
			
		||||
            signatureTextEdit.text =  String.format(getString(R.string.dialog_event_detail_signature), event.signature)
 | 
			
		||||
            signatureTextEdit.visibility = View.VISIBLE
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        // create next/previous links to events of the same type
 | 
			
		||||
 | 
			
		||||
        val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
 | 
			
		||||
@@ -638,6 +645,8 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
    fun logEvent(event: LunaEvent) {
 | 
			
		||||
        savingEvent(true)
 | 
			
		||||
 | 
			
		||||
        event.signature = signature
 | 
			
		||||
 | 
			
		||||
        setLoading(true)
 | 
			
		||||
        logbook?.logs?.add(0, event)
 | 
			
		||||
        recyclerView.adapter?.notifyItemInserted(0)
 | 
			
		||||
@@ -787,6 +796,10 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
                askTemperatureValue()
 | 
			
		||||
                dismiss()
 | 
			
		||||
            })
 | 
			
		||||
            contentView.findViewById<View>(R.id.button_puke).setOnClickListener({
 | 
			
		||||
                logEvent(LunaEvent(LunaEvent.TYPE_PUKE))
 | 
			
		||||
                dismiss()
 | 
			
		||||
            })
 | 
			
		||||
            contentView.findViewById<View>(R.id.button_colic).setOnClickListener({
 | 
			
		||||
                logEvent(
 | 
			
		||||
                    LunaEvent(LunaEvent.TYPE_COLIC)
 | 
			
		||||
@@ -797,6 +810,12 @@ class MainActivity : AppCompatActivity() {
 | 
			
		||||
                askWeightValue()
 | 
			
		||||
                dismiss()
 | 
			
		||||
            })
 | 
			
		||||
            contentView.findViewById<View>(R.id.button_bath).setOnClickListener({
 | 
			
		||||
                logEvent(
 | 
			
		||||
                    LunaEvent(LunaEvent.TYPE_BATH)
 | 
			
		||||
                )
 | 
			
		||||
                dismiss()
 | 
			
		||||
            })
 | 
			
		||||
        }.also { popupWindow ->
 | 
			
		||||
            popupWindow.setOnDismissListener({
 | 
			
		||||
                Handler(mainLooper).postDelayed({
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package it.danieleverducci.lunatracker
 | 
			
		||||
 | 
			
		||||
import android.os.Bundle
 | 
			
		||||
import android.view.View
 | 
			
		||||
import android.widget.EditText
 | 
			
		||||
import android.widget.RadioButton
 | 
			
		||||
import android.widget.TextView
 | 
			
		||||
import android.widget.Toast
 | 
			
		||||
@@ -24,6 +25,7 @@ open class SettingsActivity : AppCompatActivity() {
 | 
			
		||||
    protected lateinit var textViewWebDAVPass: TextView
 | 
			
		||||
    protected lateinit var progressIndicator: LinearProgressIndicator
 | 
			
		||||
    protected lateinit var switchNoBreastfeeding: SwitchMaterial
 | 
			
		||||
    protected lateinit var textViewSignature: EditText
 | 
			
		||||
 | 
			
		||||
    override fun onCreate(savedInstanceState: Bundle?) {
 | 
			
		||||
        super.onCreate(savedInstanceState)
 | 
			
		||||
@@ -36,6 +38,7 @@ open class SettingsActivity : AppCompatActivity() {
 | 
			
		||||
        textViewWebDAVPass = findViewById(R.id.settings_data_webdav_pass)
 | 
			
		||||
        progressIndicator = findViewById(R.id.progress_indicator)
 | 
			
		||||
        switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
 | 
			
		||||
        textViewSignature = findViewById(R.id.settings_signature)
 | 
			
		||||
 | 
			
		||||
        findViewById<View>(R.id.settings_save).setOnClickListener({
 | 
			
		||||
            validateAndSave()
 | 
			
		||||
@@ -52,12 +55,14 @@ open class SettingsActivity : AppCompatActivity() {
 | 
			
		||||
        val dataRepo = settingsRepository.loadDataRepository()
 | 
			
		||||
        val webDavCredentials = settingsRepository.loadWebdavCredentials()
 | 
			
		||||
        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
 | 
			
		||||
        val signature = settingsRepository.loadSignature()
 | 
			
		||||
 | 
			
		||||
        when (dataRepo) {
 | 
			
		||||
            LocalSettingsRepository.DATA_REPO.LOCAL_FILE -> radioDataLocal.isChecked = true
 | 
			
		||||
            LocalSettingsRepository.DATA_REPO.WEBDAV -> radioDataWebDAV.isChecked = true
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        textViewSignature.setText(signature)
 | 
			
		||||
        switchNoBreastfeeding.isChecked = noBreastfeeding
 | 
			
		||||
 | 
			
		||||
        if (webDavCredentials != null) {
 | 
			
		||||
@@ -156,6 +161,7 @@ open class SettingsActivity : AppCompatActivity() {
 | 
			
		||||
            else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
 | 
			
		||||
        )
 | 
			
		||||
        settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
 | 
			
		||||
        settingsRepository.saveSignature(textViewSignature.text.toString())
 | 
			
		||||
        settingsRepository.saveWebdavCredentials(
 | 
			
		||||
            textViewWebDAVUrl.text.toString(),
 | 
			
		||||
            textViewWebDAVUser.text.toString(),
 | 
			
		||||
 
 | 
			
		||||
@@ -28,6 +28,8 @@ class LunaEvent: Comparable<LunaEvent> {
 | 
			
		||||
        const val TYPE_COLIC = "COLIC"
 | 
			
		||||
        const val TYPE_TEMPERATURE = "TEMPERATURE"
 | 
			
		||||
        const val TYPE_FOOD = "FOOD"
 | 
			
		||||
        const val TYPE_PUKE = "PUKE"
 | 
			
		||||
        const val TYPE_BATH = "BATH"
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private val jo: JSONObject
 | 
			
		||||
@@ -53,6 +55,12 @@ class LunaEvent: Comparable<LunaEvent> {
 | 
			
		||||
        set(value) {
 | 
			
		||||
            jo.put("notes", value)
 | 
			
		||||
        }
 | 
			
		||||
    var signature: String
 | 
			
		||||
        get(): String = jo.optString("signature")
 | 
			
		||||
        set(value) {
 | 
			
		||||
            if (value.isNotEmpty())
 | 
			
		||||
                jo.put("signature", value)
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
    constructor(jo: JSONObject) {
 | 
			
		||||
        this.jo = jo
 | 
			
		||||
@@ -90,6 +98,8 @@ class LunaEvent: Comparable<LunaEvent> {
 | 
			
		||||
                TYPE_TEMPERATURE -> R.string.event_temperature_type
 | 
			
		||||
                TYPE_COLIC -> R.string.event_colic_type
 | 
			
		||||
                TYPE_FOOD -> R.string.event_food_type
 | 
			
		||||
                TYPE_PUKE -> R.string.event_puke_type
 | 
			
		||||
                TYPE_BATH -> R.string.event_bath_type
 | 
			
		||||
                else -> R.string.event_unknown_type
 | 
			
		||||
            }
 | 
			
		||||
        )
 | 
			
		||||
@@ -111,6 +121,8 @@ class LunaEvent: Comparable<LunaEvent> {
 | 
			
		||||
                TYPE_TEMPERATURE -> R.string.event_temperature_desc
 | 
			
		||||
                TYPE_COLIC -> R.string.event_colic_desc
 | 
			
		||||
                TYPE_FOOD -> R.string.event_food_desc
 | 
			
		||||
                TYPE_PUKE -> R.string.event_puke_desc
 | 
			
		||||
                TYPE_BATH -> R.string.event_bath_desc
 | 
			
		||||
                else -> R.string.event_unknown_desc
 | 
			
		||||
            }
 | 
			
		||||
        )
 | 
			
		||||
 
 | 
			
		||||
@@ -14,6 +14,7 @@ class LocalSettingsRepository(val context: Context) {
 | 
			
		||||
        const val SHARED_PREFS_DAV_USER = "webdav_user"
 | 
			
		||||
        const val SHARED_PREFS_DAV_PASS = "webdav_password"
 | 
			
		||||
        const val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
 | 
			
		||||
        const val SHARED_PREFS_SIGNATURE = "signature"
 | 
			
		||||
    }
 | 
			
		||||
    enum class DATA_REPO {LOCAL_FILE, WEBDAV}
 | 
			
		||||
    val sharedPreferences: SharedPreferences
 | 
			
		||||
@@ -30,6 +31,14 @@ class LocalSettingsRepository(val context: Context) {
 | 
			
		||||
        return sharedPreferences.getInt(SHARED_PREFS_BB_CONTENT, 1)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun saveSignature(content: String) {
 | 
			
		||||
        sharedPreferences.edit { putString(SHARED_PREFS_SIGNATURE, content) }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun loadSignature(): String {
 | 
			
		||||
        return sharedPreferences.getString(SHARED_PREFS_SIGNATURE, "") ?: ""
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    fun saveNoBreastfeeding(content: Boolean) {
 | 
			
		||||
        sharedPreferences.edit { putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content) }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,10 @@ import java.util.Date
 | 
			
		||||
 | 
			
		||||
class DateUtils {
 | 
			
		||||
    companion object {
 | 
			
		||||
        /**
 | 
			
		||||
         * Format time duration in seconds as e.g. "2 hours, 1 min".
 | 
			
		||||
         * Used for the duration to the next/previous event in the event details dialog.
 | 
			
		||||
         */
 | 
			
		||||
        fun formatTimeDuration(context: Context, secondsDiff: Long): String {
 | 
			
		||||
            var seconds = secondsDiff
 | 
			
		||||
 | 
			
		||||
@@ -65,7 +69,8 @@ class DateUtils {
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /**
 | 
			
		||||
         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
 | 
			
		||||
         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago".
 | 
			
		||||
         * Used for the event list.
 | 
			
		||||
         */
 | 
			
		||||
        fun formatTimeAgo(context: Context, unixTime: Long): String {
 | 
			
		||||
            val secondsDiff = (System.currentTimeMillis() / 1000) - unixTime
 | 
			
		||||
@@ -100,5 +105,17 @@ class DateUtils {
 | 
			
		||||
            }
 | 
			
		||||
            return formattedTime.toString()
 | 
			
		||||
        }
 | 
			
		||||
 | 
			
		||||
        /**
 | 
			
		||||
         * Format time as localized string. E.g. "28 Sept 03:36:00".
 | 
			
		||||
         * The seconds are set to 0 since they are distracting and not relevant.
 | 
			
		||||
         * Used in the event detail dialog.
 | 
			
		||||
         */
 | 
			
		||||
        fun formatDateTime(unixTime: Long): String {
 | 
			
		||||
            val roundedUnixTime = unixTime - (unixTime % 60)
 | 
			
		||||
            val date = Date(roundedUnixTime * 1000)
 | 
			
		||||
            val dateFormat = java.text.DateFormat.getDateTimeInstance()
 | 
			
		||||
            return dateFormat.format(date)
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
@@ -18,8 +18,8 @@ class NumericUtils (val context: Context) {
 | 
			
		||||
    private fun isMetricSystem(): Boolean {
 | 
			
		||||
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
 | 
			
		||||
            val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
 | 
			
		||||
            return (measurementSystem == LocaleData. MeasurementSystem.SI)
 | 
			
		||||
        } else {
 | 
			
		||||
            return (measurementSystem == LocaleData.MeasurementSystem.SI)
 | 
			
		||||
       } else {
 | 
			
		||||
            val locale = context.resources.configuration.locale
 | 
			
		||||
            return when (locale.country) {
 | 
			
		||||
                // https://en.wikipedia.org/wiki/United_States_customary_units
 | 
			
		||||
@@ -27,9 +27,9 @@ class NumericUtils (val context: Context) {
 | 
			
		||||
                "US" -> false // US IMPERIAL
 | 
			
		||||
                // UK, Myanmar, Liberia,
 | 
			
		||||
                "GB", "MM", "LR" -> false // IMPERIAL
 | 
			
		||||
                else -> true // UnitSystem.METRIC
 | 
			
		||||
                else -> true // METRIC
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
       }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    init {
 | 
			
		||||
@@ -62,11 +62,13 @@ class NumericUtils (val context: Context) {
 | 
			
		||||
 | 
			
		||||
    fun formatEventQuantity(item: LunaEvent): String {
 | 
			
		||||
        val formatted = StringBuilder()
 | 
			
		||||
        if ((item.quantity ?: 0) > 0) {
 | 
			
		||||
            if (item.type == LunaEvent.TYPE_TEMPERATURE)
 | 
			
		||||
                formatted.append((item.quantity / 10.0f).toString())
 | 
			
		||||
            else
 | 
			
		||||
                formatted.append(item.quantity)
 | 
			
		||||
        if (item.quantity > 0) {
 | 
			
		||||
            formatted.append(when (item.type) {
 | 
			
		||||
                LunaEvent.TYPE_TEMPERATURE ->
 | 
			
		||||
                    (item.quantity / 10.0f).toString()
 | 
			
		||||
                else ->
 | 
			
		||||
                    item.quantity
 | 
			
		||||
            })
 | 
			
		||||
 | 
			
		||||
            formatted.append(" ")
 | 
			
		||||
            formatted.append(
 | 
			
		||||
 
 | 
			
		||||
@@ -119,28 +119,57 @@
 | 
			
		||||
                android:visibility="invisible"/>
 | 
			
		||||
        </RadioGroup>
 | 
			
		||||
 | 
			
		||||
        <TextView
 | 
			
		||||
            android:layout_width="wrap_content"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:textStyle="bold"
 | 
			
		||||
            android:text="@string/settings_signature" />
 | 
			
		||||
 | 
			
		||||
        <EditText
 | 
			
		||||
            android:id="@+id/settings_signature"
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginStart="20dp"
 | 
			
		||||
            android:layout_marginTop="20dp"
 | 
			
		||||
            android:inputType="textEmailAddress"
 | 
			
		||||
            android:background="@drawable/textview_background"/>
 | 
			
		||||
 | 
			
		||||
        <TextView
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginStart="30dp"
 | 
			
		||||
            android:layout_marginTop="5dp"
 | 
			
		||||
            android:text="@string/settings_signature_desc"/>
 | 
			
		||||
 | 
			
		||||
        <LinearLayout
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:orientation="horizontal"
 | 
			
		||||
            android:layout_marginTop="5dp"
 | 
			
		||||
            android:layout_marginEnd="30dp">
 | 
			
		||||
            android:layout_marginTop="20dp">
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:layout_width="0dp"
 | 
			
		||||
                android:layout_weight="1"
 | 
			
		||||
                android:layout_height="wrap_content"
 | 
			
		||||
                android:textStyle="bold"
 | 
			
		||||
                android:text="@string/no_breastfeeding" />
 | 
			
		||||
                android:text="@string/settings_no_breastfeeding" />
 | 
			
		||||
 | 
			
		||||
            <com.google.android.material.switchmaterial.SwitchMaterial
 | 
			
		||||
                android:id="@+id/switch_no_breastfeeding"
 | 
			
		||||
                android:layout_width="0dp"
 | 
			
		||||
                android:layout_width="wrap_content"
 | 
			
		||||
                android:layout_height="wrap_content"
 | 
			
		||||
                android:layout_marginEnd="20dp"
 | 
			
		||||
                android:layout_weight="1" />
 | 
			
		||||
 | 
			
		||||
        </LinearLayout>
 | 
			
		||||
 | 
			
		||||
        <TextView
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
            android:layout_marginStart="30dp"
 | 
			
		||||
            android:layout_marginTop="5dp"
 | 
			
		||||
            android:text="@string/settings_no_breastfeeding_desc"/>
 | 
			
		||||
 | 
			
		||||
        <LinearLayout
 | 
			
		||||
            android:layout_width="match_parent"
 | 
			
		||||
            android:layout_height="wrap_content"
 | 
			
		||||
 
 | 
			
		||||
@@ -61,6 +61,14 @@
 | 
			
		||||
 | 
			
		||||
    </ScrollView>
 | 
			
		||||
 | 
			
		||||
    <TextView
 | 
			
		||||
        android:layout_width="wrap_content"
 | 
			
		||||
        android:layout_height="wrap_content"
 | 
			
		||||
        android:layout_gravity="center_horizontal"
 | 
			
		||||
        android:id="@+id/dialog_event_detail_type_signature"
 | 
			
		||||
        android:layout_marginBottom="5dp"
 | 
			
		||||
        android:visibility="gone"/>
 | 
			
		||||
 | 
			
		||||
    <LinearLayout
 | 
			
		||||
        android:layout_width="match_parent"
 | 
			
		||||
        android:layout_height="wrap_content"
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
    android:layout_width="match_parent"
 | 
			
		||||
    android:layout_height="match_parent"
 | 
			
		||||
    android:padding="20dp"
 | 
			
		||||
    android:padding="10dp"
 | 
			
		||||
    android:background="@color/transparent">
 | 
			
		||||
 | 
			
		||||
    <LinearLayout
 | 
			
		||||
@@ -14,27 +14,17 @@
 | 
			
		||||
                android:id="@+id/button_medicine"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_medicine"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_enema"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_enema"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_note"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_note"/>
 | 
			
		||||
@@ -44,17 +34,27 @@
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_temperature"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_puke"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_puke"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_colic"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_colic"/>
 | 
			
		||||
@@ -64,11 +64,31 @@
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="20dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_scale"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_bath"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_bath"/>
 | 
			
		||||
 | 
			
		||||
            <TextView
 | 
			
		||||
                android:id="@+id/button_enema"
 | 
			
		||||
                android:layout_width="match_parent"
 | 
			
		||||
                android:layout_height="match_parent"
 | 
			
		||||
                android:layout_marginTop="10dp"
 | 
			
		||||
                android:padding="10dp"
 | 
			
		||||
                android:background="@drawable/dropdown_list_item_background"
 | 
			
		||||
                style="@style/OverflowMenuText"
 | 
			
		||||
                android:text="@string/overflow_event_enema"/>
 | 
			
		||||
 | 
			
		||||
    </LinearLayout>
 | 
			
		||||
 | 
			
		||||
</ScrollView>
 | 
			
		||||
@@ -50,9 +50,8 @@
 | 
			
		||||
    <string name="no_connection_go_to_settings">Einstellungen</string>
 | 
			
		||||
    <string name="no_connection_retry">Erneut versuchen</string>
 | 
			
		||||
 | 
			
		||||
    <string name="no_breastfeeding">Kein Stillen</string>
 | 
			
		||||
 | 
			
		||||
    <string name="settings_title">Einstellungen</string>
 | 
			
		||||
    <string name="settings_no_breastfeeding">Kein Stillen</string>
 | 
			
		||||
    <string name="settings_storage">Speicherort für Daten auswählen</string>
 | 
			
		||||
    <string name="settings_storage_local">Auf dem Gerät</string>
 | 
			
		||||
    <string name="settings_storage_local_desc">Datenschutzfreundlichste Lösung: Deine Daten verlassen dein Gerät nicht</string>
 | 
			
		||||
 
 | 
			
		||||
@@ -25,6 +25,8 @@
 | 
			
		||||
    <string name="event_note_type" translatable="false">📝</string>
 | 
			
		||||
    <string name="event_temperature_type" translatable="false">🌡️</string>
 | 
			
		||||
    <string name="event_colic_type" translatable="false">💨</string>
 | 
			
		||||
    <string name="event_puke_type" translatable="false">🤮</string>
 | 
			
		||||
    <string name="event_bath_type" translatable="false">🛁</string>
 | 
			
		||||
    <string name="event_unknown_type" translatable="false">\?</string>
 | 
			
		||||
 | 
			
		||||
    <string name="event_bottle_desc">Baby bottle</string>
 | 
			
		||||
@@ -40,6 +42,8 @@
 | 
			
		||||
    <string name="event_note_desc">Note</string>
 | 
			
		||||
    <string name="event_temperature_desc">Temperature</string>
 | 
			
		||||
    <string name="event_colic_desc">Gaseous colic</string>
 | 
			
		||||
    <string name="event_puke_desc">Puke</string>
 | 
			
		||||
    <string name="event_bath_desc">Bath</string>
 | 
			
		||||
    <string name="event_unknown_desc"></string>
 | 
			
		||||
 | 
			
		||||
    <string name="overflow_event_scale">⚖️ Weight</string>
 | 
			
		||||
@@ -48,6 +52,8 @@
 | 
			
		||||
    <string name="overflow_event_note">📝 Note</string>
 | 
			
		||||
    <string name="overflow_event_temperature">🌡️ Temperature</string>
 | 
			
		||||
    <string name="overflow_event_colic">💨 Gaseous colic</string>
 | 
			
		||||
    <string name="overflow_event_puke">🤮 Puke</string>
 | 
			
		||||
    <string name="overflow_event_bath">🛁 Bath</string>
 | 
			
		||||
 | 
			
		||||
    <string name="toast_event_added">Event logged</string>
 | 
			
		||||
    <string name="toast_logbook_saved">Logbook saved</string>
 | 
			
		||||
@@ -71,9 +77,9 @@
 | 
			
		||||
    <string name="no_connection_go_to_settings">Settings</string>
 | 
			
		||||
    <string name="no_connection_retry">Retry</string>
 | 
			
		||||
 | 
			
		||||
    <string name="no_breastfeeding">No Breastfeeding</string>
 | 
			
		||||
 | 
			
		||||
    <string name="settings_title">Settings</string>
 | 
			
		||||
    <string name="settings_signature">Signature</string>
 | 
			
		||||
    <string name="settings_signature_desc">Attach a signature to each event you create and for others to see. Useful if multiple people add events.</string>
 | 
			
		||||
    <string name="settings_storage">Choose where to save data</string>
 | 
			
		||||
    <string name="settings_storage_local">On device</string>
 | 
			
		||||
    <string name="settings_storage_local_desc">Most privacy-friendly solution: data doesn\'t leave your device</string>
 | 
			
		||||
@@ -89,6 +95,8 @@
 | 
			
		||||
    <string name="settings_webdav_error_generic">Error while trying to access WebDAV:</string>
 | 
			
		||||
    <string name="settings_webdav_creation_error_generic">Unable to save a file on the WebDAV server:</string>
 | 
			
		||||
    <string name="settings_webdav_creation_ok">Successfully connected with the WebDAV server</string>
 | 
			
		||||
    <string name="settings_no_breastfeeding">No Breastfeeding</string>
 | 
			
		||||
    <string name="settings_no_breastfeeding_desc">Hide the Breastfeeding buttons for when they are not needed.</string>
 | 
			
		||||
    <string name="settings_json_error">There\'s a save file on the server, but it is corrupted or unreadable. Please delete it </string>
 | 
			
		||||
    <string name="settings_generic_error">Error: </string>
 | 
			
		||||
    <string name="settings_webdav_upload_error">Error while uploading local logbook %1$s to webdav: %2$s</string>
 | 
			
		||||
@@ -123,6 +131,7 @@
 | 
			
		||||
    <string name="dialog_event_detail_delete_button">Delete</string>
 | 
			
		||||
    <string name="dialog_event_detail_quantity">Quantity</string>
 | 
			
		||||
    <string name="dialog_event_detail_notes">Notes</string>
 | 
			
		||||
    <string name="dialog_event_detail_signature">by %s</string>
 | 
			
		||||
 | 
			
		||||
    <string name="dialog_add_logbook_title">Add logbook</string>
 | 
			
		||||
    <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user