forked from penguin86/luna-tracker
Compare commits
4 Commits
remove_sta
...
3e6a92fb14
| Author | SHA1 | Date | |
|---|---|---|---|
| 3e6a92fb14 | |||
| 11a4f12fbe | |||
| 9398e5c406 | |||
| 5a9488fdb9 |
@@ -6,12 +6,12 @@ plugins {
|
||||
|
||||
android {
|
||||
namespace = "it.danieleverducci.lunatracker"
|
||||
compileSdk = 36
|
||||
compileSdk = 34
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "it.danieleverducci.lunatracker"
|
||||
minSdk = 21
|
||||
targetSdk = 36
|
||||
targetSdk = 34
|
||||
versionCode = 7
|
||||
versionName = "0.9"
|
||||
|
||||
@@ -31,12 +31,6 @@ android {
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
dependenciesInfo {
|
||||
// Disables dependency metadata when building APKs.
|
||||
includeInApk = false
|
||||
// Disables dependency metadata when building Android App Bundles.
|
||||
includeInBundle = false
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "11"
|
||||
}
|
||||
@@ -46,6 +40,7 @@ android {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation(libs.androidx.core.ktx)
|
||||
implementation(libs.androidx.lifecycle.runtime.ktx)
|
||||
implementation(libs.androidx.activity.compose)
|
||||
@@ -56,7 +51,7 @@ dependencies {
|
||||
implementation(libs.androidx.material3)
|
||||
implementation(libs.androidx.appcompat)
|
||||
implementation(libs.androidx.recyclerview)
|
||||
implementation(libs.sardine.android)
|
||||
implementation("com.github.thegrizzlylabs:sardine-android:v0.9")
|
||||
implementation(libs.material)
|
||||
testImplementation(libs.junit)
|
||||
androidTestImplementation(libs.androidx.junit)
|
||||
@@ -65,4 +60,7 @@ dependencies {
|
||||
androidTestImplementation(libs.androidx.ui.test.junit4)
|
||||
debugImplementation(libs.androidx.ui.tooling)
|
||||
debugImplementation(libs.androidx.ui.test.manifest)
|
||||
implementation("com.github.PhilJay:MPAndroidChart:v3.1.0")
|
||||
// implementation(libs.mpandroidchart)
|
||||
//implementation project(':MPChartLib')
|
||||
}
|
||||
|
||||
@@ -30,6 +30,10 @@
|
||||
android:name=".SettingsActivity"
|
||||
android:label="@string/settings_title"
|
||||
android:theme="@style/Theme.LunaTracker"/>
|
||||
<activity
|
||||
android:name=".StatisticsActivity"
|
||||
android:label="@string/statistics_title"
|
||||
android:theme="@style/Theme.LunaTracker"/>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -15,7 +15,6 @@ import android.widget.AdapterView
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.Button
|
||||
import android.widget.EditText
|
||||
import android.widget.LinearLayout
|
||||
import android.widget.NumberPicker
|
||||
import android.widget.PopupWindow
|
||||
import android.widget.Spinner
|
||||
@@ -52,9 +51,6 @@ class MainActivity : AppCompatActivity() {
|
||||
const val TAG = "MainActivity"
|
||||
const val UPDATE_EVERY_SECS: Long = 30
|
||||
const val DEBUG_CHECK_LOGBOOK_CONSISTENCY = false
|
||||
// list of all events
|
||||
var allEvents = arrayListOf<LunaEvent>()
|
||||
var currentPopupItems = listOf<LunaEvent.Type>()
|
||||
}
|
||||
|
||||
var logbook: Logbook? = null
|
||||
@@ -86,13 +82,31 @@ class MainActivity : AppCompatActivity() {
|
||||
recyclerView = findViewById(R.id.list_events)
|
||||
recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))
|
||||
|
||||
populateHeaderMenu()
|
||||
|
||||
// Set listeners
|
||||
findViewById<View>(R.id.logbooks_add_button).setOnClickListener {
|
||||
showAddLogbookDialog(true)
|
||||
}
|
||||
|
||||
findViewById<View>(R.id.button_bottle).setOnClickListener {
|
||||
addBabyBottleEvent(LunaEvent(LunaEvent.TYPE_BABY_BOTTLE))
|
||||
}
|
||||
findViewById<View>(R.id.button_food).setOnClickListener {
|
||||
addNoteEvent(LunaEvent(LunaEvent.TYPE_FOOD))
|
||||
}
|
||||
findViewById<View>(R.id.button_nipple_left).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE))
|
||||
}
|
||||
findViewById<View>(R.id.button_nipple_both).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE))
|
||||
}
|
||||
findViewById<View>(R.id.button_nipple_right).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE))
|
||||
}
|
||||
findViewById<View>(R.id.button_change_poo).setOnClickListener {
|
||||
addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_POO))
|
||||
}
|
||||
findViewById<View>(R.id.button_change_pee).setOnClickListener {
|
||||
addAmountEvent(LunaEvent(LunaEvent.TYPE_DIAPERCHANGE_PEE))
|
||||
}
|
||||
val moreButton = findViewById<View>(R.id.button_more)
|
||||
moreButton.setOnClickListener {
|
||||
showOverflowPopupWindow(moreButton)
|
||||
@@ -108,11 +122,7 @@ class MainActivity : AppCompatActivity() {
|
||||
loadLogbookList()
|
||||
}
|
||||
findViewById<View>(R.id.button_sync).setOnClickListener {
|
||||
if (logbook != null) {
|
||||
loadLogbook(logbook!!.name)
|
||||
} else {
|
||||
loadLogbookList()
|
||||
}
|
||||
loadLogbookList()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -136,84 +146,7 @@ class MainActivity : AppCompatActivity() {
|
||||
if (logbook == null)
|
||||
Log.w(TAG, "showLogbook(): logbook is null!")
|
||||
|
||||
allEvents = logbook?.logs ?: arrayListOf()
|
||||
setListAdapter(allEvents)
|
||||
|
||||
populateHeaderMenu()
|
||||
}
|
||||
|
||||
private fun populateHeaderMenu() {
|
||||
val settingsRepository = LocalSettingsRepository(this)
|
||||
val dynamicMenu = settingsRepository.loadDynamicMenu()
|
||||
val eventTypeStats = mutableMapOf<LunaEvent.Type, Int>()
|
||||
|
||||
if (dynamicMenu) {
|
||||
val sampleSize = 100
|
||||
// populate frequency map from first 100 events
|
||||
allEvents.take(sampleSize.coerceAtMost(allEvents.size)).forEach {
|
||||
eventTypeStats[it.type] = 1 + (eventTypeStats[it.type] ?: 0)
|
||||
}
|
||||
}
|
||||
|
||||
// sort all event types by frequency and ordinal
|
||||
val eventTypesSorted = LunaEvent.Type.entries.toList().sortedWith(
|
||||
compareBy({ -1 * (eventTypeStats[it] ?: 0) }, { it.ordinal })
|
||||
).filter { it != LunaEvent.Type.UNKNOWN }
|
||||
|
||||
fun setupMenu(maxButtonCount: Int, sortedEventTypes: List<LunaEvent.Type>): Int {
|
||||
val row1 = findViewById<View>(R.id.linear_layout_row1)
|
||||
val row1Button1 = findViewById<TextView>(R.id.button1_row1)
|
||||
val row1Button2 = findViewById<TextView>(R.id.button2_row1)
|
||||
|
||||
val row2 = findViewById<View>(R.id.linear_layout_row2)
|
||||
val row2Button1 = findViewById<TextView>(R.id.button1_row2)
|
||||
val row2Button2 = findViewById<TextView>(R.id.button2_row2)
|
||||
val row2Button3 = findViewById<TextView>(R.id.button3_row2)
|
||||
|
||||
val row3 = findViewById<View>(R.id.linear_layout_row3)
|
||||
val row3Button1 = findViewById<TextView>(R.id.button1_row3)
|
||||
val row3Button2 = findViewById<TextView>(R.id.button2_row3)
|
||||
|
||||
// hide all rows/buttons (except row 3)
|
||||
for (view in listOf(row1, row1Button1, row1Button2,
|
||||
row2, row2Button1, row2Button2, row2Button3,
|
||||
row3, row3Button1, row3Button2)) {
|
||||
view.visibility = View.GONE
|
||||
}
|
||||
row3.visibility = View.VISIBLE
|
||||
|
||||
var showCounter = 0
|
||||
|
||||
fun show(vararg tvs: TextView) {
|
||||
for (tv in tvs) {
|
||||
val type = sortedEventTypes[showCounter]
|
||||
tv.text = LunaEvent.getHeaderEmoji(applicationContext, type)
|
||||
tv.setOnClickListener { showCreateDialog(type) }
|
||||
tv.visibility = View.VISIBLE
|
||||
// show parent row
|
||||
(tv.parent as View).visibility = View.VISIBLE
|
||||
showCounter += 1
|
||||
}
|
||||
}
|
||||
|
||||
when (maxButtonCount) {
|
||||
0 -> { } // ignore - show empty row3
|
||||
1 -> show(row3Button1)
|
||||
2 -> show(row3Button1, row3Button2)
|
||||
3 -> show(row1Button1, row3Button1)
|
||||
4, 5, 6 -> show(row1Button1, row1Button2, row3Button1, row3Button2)
|
||||
else -> show(row1Button1, row1Button2, row2Button1, row2Button2, row2Button3, row3Button1, row3Button2)
|
||||
}
|
||||
|
||||
return showCounter
|
||||
}
|
||||
|
||||
val usedEventCount = eventTypeStats.count { it.value > 0 }
|
||||
val maxButtonCount = if (dynamicMenu) { usedEventCount } else { 7 }
|
||||
val eventsShown = setupMenu(maxButtonCount, eventTypesSorted)
|
||||
|
||||
// store left over events for popup menu
|
||||
currentPopupItems = eventTypesSorted.subList(eventsShown, eventTypesSorted.size)
|
||||
setListAdapter(logbook?.logs ?: arrayListOf())
|
||||
}
|
||||
|
||||
override fun onStart() {
|
||||
@@ -236,6 +169,12 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
signature = settingsRepository.loadSignature()
|
||||
|
||||
val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
|
||||
findViewById<View>(R.id.layout_nipples).visibility = when (noBreastfeeding) {
|
||||
true -> View.GONE
|
||||
false -> View.VISIBLE
|
||||
}
|
||||
|
||||
// Update list dates
|
||||
recyclerView.adapter?.notifyDataSetChanged()
|
||||
|
||||
@@ -254,6 +193,10 @@ class MainActivity : AppCompatActivity() {
|
||||
super.onStop()
|
||||
}
|
||||
|
||||
fun getAllEvents(): ArrayList<LunaEvent> {
|
||||
return logbook?.logs ?: arrayListOf()
|
||||
}
|
||||
|
||||
fun addBabyBottleEvent(event: LunaEvent) {
|
||||
setToPreviousQuantity(event)
|
||||
askBabyBottleContent(event, true) {
|
||||
@@ -264,19 +207,19 @@ class MainActivity : AppCompatActivity() {
|
||||
fun askBabyBottleContent(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_bottle, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
val numberPicker = dialogView.findViewById<NumberPicker>(R.id.dialog_number_picker)
|
||||
numberPicker.minValue = 1 // "10"
|
||||
numberPicker.maxValue = 34 // "340
|
||||
numberPicker.displayedValues = ((10..340 step 10).map { it.toString() }.toTypedArray())
|
||||
numberPicker.maxValue = 25 // "250
|
||||
numberPicker.displayedValues = ((10..250 step 10).map { it.toString() }.toTypedArray())
|
||||
numberPicker.wrapSelectorWheel = false
|
||||
numberPicker.value = event.quantity / 10
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedTime = datePickerHelper(event.time, dateTV)
|
||||
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
@@ -306,7 +249,7 @@ class MainActivity : AppCompatActivity() {
|
||||
// Show number picker dialog
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_weight, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
@@ -314,7 +257,7 @@ class MainActivity : AppCompatActivity() {
|
||||
weightET.setText(event.quantity.toString())
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedTime = datePickerHelper(event.time, dateTV)
|
||||
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
@@ -350,12 +293,12 @@ class MainActivity : AppCompatActivity() {
|
||||
// Show number picker dialog
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_temperature, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
val tempSlider = dialogView.findViewById<Slider>(R.id.dialog_temperature_value)
|
||||
val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.Type.TEMPERATURE)!!
|
||||
val range = NumericUtils(this).getValidEventQuantityRange(LunaEvent.TYPE_TEMPERATURE)!!
|
||||
tempSlider.valueFrom = range.first.toFloat()
|
||||
tempSlider.valueTo = range.second.toFloat()
|
||||
tempSlider.value = if (event.quantity == 0) {
|
||||
@@ -365,7 +308,7 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedTime = datePickerHelper(event.time, dateTV)
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
}
|
||||
@@ -389,8 +332,7 @@ class MainActivity : AppCompatActivity() {
|
||||
alertDialog.show()
|
||||
}
|
||||
|
||||
// Pick a date/time.
|
||||
fun dateTimePicker(time: Long, dateTextView: TextView, onChange: (Long) -> Unit = {}): Calendar {
|
||||
fun datePickerHelper(time: Long, dateTextView: TextView, onChange: (Long) -> Unit = {}): Calendar {
|
||||
dateTextView.text = DateUtils.formatDateTime(time)
|
||||
|
||||
val dateTime = Calendar.getInstance()
|
||||
@@ -421,83 +363,89 @@ class MainActivity : AppCompatActivity() {
|
||||
return dateTime
|
||||
}
|
||||
|
||||
fun addSleepEvent(event: LunaEvent) {
|
||||
askSleepValue(event, true) { saveEvent(event) }
|
||||
fun saveEvent(event: LunaEvent) {
|
||||
if (!getAllEvents().contains(event)) {
|
||||
// new event
|
||||
logEvent(event)
|
||||
}
|
||||
|
||||
logbook?.sort()
|
||||
recyclerView.adapter?.notifyDataSetChanged()
|
||||
saveLogbook()
|
||||
}
|
||||
|
||||
fun askSleepValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
fun addSleepEvent(event: LunaEvent) {
|
||||
askSleepValue(event) { saveEvent(event) }
|
||||
}
|
||||
|
||||
fun askSleepValue(event: LunaEvent, onPositive: () -> Unit) {
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_duration, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
val durationTextView = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
|
||||
val datePickerBegin = dialogView.findViewById<TextView>(R.id.dialog_date_picker_begin)
|
||||
val datePickerEnd = dialogView.findViewById<TextView>(R.id.dialog_date_picker_end)
|
||||
val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
|
||||
val datePicker = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
|
||||
val durationPlus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus5)
|
||||
|
||||
val currentDurationTextColor = durationTextView.currentTextColor
|
||||
val invalidDurationTextColor = ContextCompat.getColor(this, R.color.danger)
|
||||
|
||||
// in seconds
|
||||
var sleepStart = event.time
|
||||
var sleepEnd = event.time + event.quantity
|
||||
var duration = event.quantity
|
||||
|
||||
fun isValidTimeSpan(timeBeginUnix: Long, timeEndUnix: Long): Boolean {
|
||||
val now = System.currentTimeMillis() / 1000
|
||||
return (timeBeginUnix > 0)
|
||||
&& (timeEndUnix > 0)
|
||||
&& (timeBeginUnix <= timeEndUnix)
|
||||
&& (timeBeginUnix <= now)
|
||||
&& (timeEndUnix <= now)
|
||||
&& (timeEndUnix - timeBeginUnix) < (24 * 60 * 60)
|
||||
fun isValidTime(timeSeconds: Long, durationSeconds: Int): Boolean {
|
||||
val now = Calendar.getInstance().time.time / 1000
|
||||
return (timeSeconds + durationSeconds) <= now && durationSeconds < (12 * 60 * 60)
|
||||
}
|
||||
|
||||
// prevent printing of seconds
|
||||
fun adjustToMinute(unixTime: Long): Long {
|
||||
return unixTime - (unixTime % 60)
|
||||
}
|
||||
|
||||
fun updateDuration() {
|
||||
val onDateChange = { time: Long ->
|
||||
durationTextView.setTextColor(currentDurationTextColor)
|
||||
val duration = sleepEnd - sleepStart
|
||||
if (duration == 0L) {
|
||||
|
||||
if (duration == 0) {
|
||||
// baby is sleeping
|
||||
durationTextView.text = "💤"
|
||||
} else {
|
||||
durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration)
|
||||
if (!isValidTimeSpan(sleepStart, sleepEnd)) {
|
||||
durationTextView.text = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
|
||||
if (!isValidTime(time, duration)) {
|
||||
durationTextView.setTextColor(invalidDurationTextColor)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val pickedDateTimeBegin = dateTimePicker(event.time, datePickerBegin) { time: Long ->
|
||||
sleepStart = adjustToMinute(time)
|
||||
updateDuration()
|
||||
val pickedDateTime = datePickerHelper(event.time, datePicker, onDateChange)
|
||||
|
||||
onDateChange(pickedDateTime.time.time / 1000)
|
||||
|
||||
fun adjust(minutes: Int) {
|
||||
duration += minutes * 60
|
||||
if (duration < 0) {
|
||||
duration = 0
|
||||
}
|
||||
onDateChange(pickedDateTime.time.time / 1000)
|
||||
}
|
||||
|
||||
val pickedDateTimeEnd = dateTimePicker(event.time + event.quantity, datePickerEnd) { time: Long ->
|
||||
sleepEnd = adjustToMinute(time)
|
||||
updateDuration()
|
||||
}
|
||||
durationMinus5Button.setOnClickListener { adjust(-5) }
|
||||
durationPlus5Button.setOnClickListener { adjust(5) }
|
||||
|
||||
sleepStart = adjustToMinute(pickedDateTimeBegin.time.time / 1000)
|
||||
sleepEnd = adjustToMinute(pickedDateTimeEnd.time.time / 1000)
|
||||
updateDuration()
|
||||
|
||||
if (showTime) {
|
||||
datePickerEnd.visibility = View.GONE
|
||||
durationTextView.visibility = View.GONE
|
||||
//d.setMessage("")
|
||||
} else {
|
||||
durationTextView.visibility = View.VISIBLE
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
durationNowButton.setOnClickListener {
|
||||
val now = Calendar.getInstance().time.time / 1000
|
||||
val start = pickedDateTime.time.time / 1000
|
||||
if (now > start) {
|
||||
duration = (now - start).toInt()
|
||||
duration -= duration % 60 // prevent printing of seconds
|
||||
onDateChange(pickedDateTime.time.time / 1000)
|
||||
}
|
||||
}
|
||||
|
||||
d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
|
||||
if (isValidTimeSpan(sleepStart, sleepEnd)) {
|
||||
event.time = sleepStart
|
||||
event.quantity = (sleepEnd - sleepStart).toInt()
|
||||
val time = pickedDateTime.time.time / 1000
|
||||
|
||||
if (isValidTime(time, duration)) {
|
||||
event.time = time
|
||||
event.quantity = duration
|
||||
onPositive()
|
||||
} else {
|
||||
Toast.makeText(this, R.string.toast_date_error, Toast.LENGTH_SHORT).show()
|
||||
@@ -514,14 +462,13 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
fun addAmountEvent(event: LunaEvent) {
|
||||
setToPreviousQuantity(event)
|
||||
askAmountValue(event, true) { saveEvent(event) }
|
||||
}
|
||||
|
||||
fun askAmountValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_amount, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
@@ -531,11 +478,11 @@ class MainActivity : AppCompatActivity() {
|
||||
R.array.AmountLabels,
|
||||
android.R.layout.simple_spinner_dropdown_item
|
||||
)
|
||||
|
||||
// set pre-selected item and ensure the quantity to index is in bounds
|
||||
spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedTime = datePickerHelper(event.time, dateTV)
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
}
|
||||
@@ -563,12 +510,12 @@ class MainActivity : AppCompatActivity() {
|
||||
fun askDateValue(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_plain, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedDateTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedDateTime = datePickerHelper(event.time, dateTV)
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
}
|
||||
@@ -592,18 +539,18 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
fun askNotes(event: LunaEvent, showTime: Boolean, onPositive: () -> Unit) {
|
||||
val useQuantity = (event.type != LunaEvent.Type.NOTE)
|
||||
val useQuantity = (event.type != LunaEvent.TYPE_NOTE && event.type != LunaEvent.TYPE_CUSTOM)
|
||||
|
||||
val d = AlertDialog.Builder(this)
|
||||
val dialogView = layoutInflater.inflate(R.layout.dialog_edit_notes, null)
|
||||
d.setTitle(event.getDialogTitle(this))
|
||||
d.setTitle(event.getTypeDescription(this))
|
||||
d.setMessage(event.getDialogMessage(this))
|
||||
d.setView(dialogView)
|
||||
val notesET = dialogView.findViewById<EditText>(R.id.notes_edittext)
|
||||
val qtyET = dialogView.findViewById<EditText>(R.id.notes_qty_edittext)
|
||||
|
||||
val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
|
||||
val pickedTime = dateTimePicker(event.time, dateTV)
|
||||
val pickedTime = datePickerHelper(event.time, dateTV)
|
||||
|
||||
if (!showTime) {
|
||||
dateTV.visibility = View.GONE
|
||||
@@ -611,7 +558,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
val nextTextView = dialogView.findViewById<TextView>(R.id.notes_template_next)
|
||||
val prevTextView = dialogView.findViewById<TextView>(R.id.notes_template_prev)
|
||||
val templates = allEvents.filter { it.type == event.type }.distinctBy { it.notes }.sortedBy { it.time }
|
||||
val templates = getAllEvents().filter { it.type == event.type }.distinctBy { it.notes.trim() }.sortedBy { it.time }
|
||||
|
||||
fun updateContent(current: LunaEvent) {
|
||||
val prevEvent = getPreviousSameEvent(current, templates)
|
||||
@@ -666,7 +613,7 @@ class MainActivity : AppCompatActivity() {
|
||||
updateContent(event)
|
||||
|
||||
d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
|
||||
val notes = notesET.text.toString().trim()
|
||||
val notes = notesET.text.toString()
|
||||
|
||||
if (useQuantity) {
|
||||
val quantity = qtyET.text.toString().toIntOrNull()
|
||||
@@ -717,7 +664,7 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
fun setToPreviousQuantity(event: LunaEvent) {
|
||||
val prev = getPreviousSameEvent(event, allEvents)
|
||||
val prev = getPreviousSameEvent(event, getAllEvents())
|
||||
if (prev != null) {
|
||||
event.quantity = prev.quantity
|
||||
}
|
||||
@@ -774,8 +721,8 @@ class MainActivity : AppCompatActivity() {
|
||||
val quantityTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity)
|
||||
val notesTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes)
|
||||
|
||||
emojiTextView.text = event.getHeaderEmoji(this)
|
||||
descriptionTextView.text = event.getDialogTitle(this)
|
||||
emojiTextView.text = event.getTypeEmoji(this)
|
||||
descriptionTextView.text = event.getTypeDescription(this)
|
||||
|
||||
d.setView(dialogView)
|
||||
|
||||
@@ -814,8 +761,8 @@ class MainActivity : AppCompatActivity() {
|
||||
val updateValues = {
|
||||
quantityTextView.text = NumericUtils(this).formatEventQuantity(event)
|
||||
notesTextView.text = event.notes
|
||||
if (event.type == LunaEvent.Type.SLEEP && event.quantity > 0) {
|
||||
dateEndTextView.text = DateUtils.formatDateTime(event.getEndTime())
|
||||
if (event.type == LunaEvent.TYPE_SLEEP && event.quantity > 0) {
|
||||
dateEndTextView.text = DateUtils.formatDateTime(event.time + event.quantity)
|
||||
dateEndTextView.visibility = View.VISIBLE
|
||||
} else {
|
||||
dateEndTextView.visibility = View.GONE
|
||||
@@ -829,35 +776,29 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
updateValues()
|
||||
|
||||
dateTimePicker(event.time, dateTextView, { newTime: Long ->
|
||||
datePickerHelper(event.time, dateTextView, { newTime: Long ->
|
||||
event.time = newTime
|
||||
updateValues()
|
||||
})
|
||||
|
||||
quantityTextView.setOnClickListener {
|
||||
when (event.type) {
|
||||
LunaEvent.Type.BABY_BOTTLE -> askBabyBottleContent(event, false, updateValues)
|
||||
LunaEvent.Type.WEIGHT -> askWeightValue(event, false, updateValues)
|
||||
LunaEvent.Type.DIAPERCHANGE_POO,
|
||||
LunaEvent.Type.DIAPERCHANGE_PEE,
|
||||
LunaEvent.Type.PUKE -> askAmountValue(event, false, updateValues)
|
||||
LunaEvent.Type.TEMPERATURE -> askTemperatureValue(event, false, updateValues)
|
||||
LunaEvent.Type.NOTE -> askNotes(event, false, updateValues)
|
||||
LunaEvent.Type.SLEEP -> askSleepValue(event, false, updateValues)
|
||||
else -> {
|
||||
Log.w(TAG, "Unexpected type: ${event.type}")
|
||||
}
|
||||
LunaEvent.TYPE_BABY_BOTTLE -> askBabyBottleContent(event, false, updateValues)
|
||||
LunaEvent.TYPE_WEIGHT -> askWeightValue(event, false, updateValues)
|
||||
LunaEvent.TYPE_DIAPERCHANGE_POO,
|
||||
LunaEvent.TYPE_DIAPERCHANGE_PEE,
|
||||
LunaEvent.TYPE_PUKE -> askAmountValue(event, false, updateValues)
|
||||
LunaEvent.TYPE_TEMPERATURE -> askTemperatureValue(event, false, updateValues)
|
||||
LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
|
||||
LunaEvent.TYPE_SLEEP -> askSleepValue(event, updateValues)
|
||||
}
|
||||
}
|
||||
|
||||
notesTextView.setOnClickListener {
|
||||
when (event.type) {
|
||||
LunaEvent.Type.FOOD,
|
||||
LunaEvent.Type.MEDICINE,
|
||||
LunaEvent.Type.NOTE -> askNotes(event, false, updateValues)
|
||||
else -> {
|
||||
Log.w(TAG, "Unexpected type: ${event.type}")
|
||||
}
|
||||
LunaEvent.TYPE_FOOD,
|
||||
LunaEvent.TYPE_MEDICINE,
|
||||
LunaEvent.TYPE_NOTE -> askNotes(event, false, updateValues)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -868,12 +809,14 @@ class MainActivity : AppCompatActivity() {
|
||||
signatureTextEdit.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
val allEvents = getAllEvents()
|
||||
|
||||
// create link to prevent event of the same type
|
||||
val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
|
||||
val previousEvent = getPreviousSameEvent(event, allEvents)
|
||||
if (previousEvent != null) {
|
||||
val emoji = previousEvent.getHeaderEmoji(applicationContext)
|
||||
val time = DateUtils.formatTimeDuration(applicationContext, event.getStartTime() - previousEvent.getEndTime())
|
||||
val emoji = previousEvent.getTypeEmoji(applicationContext)
|
||||
val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
|
||||
previousTextView.text = String.format("⬅️ %s %s", emoji, time)
|
||||
previousTextView.setOnClickListener {
|
||||
alertDialog.cancel()
|
||||
@@ -887,8 +830,8 @@ class MainActivity : AppCompatActivity() {
|
||||
val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
|
||||
val nextEvent = getNextSameEvent(event, allEvents)
|
||||
if (nextEvent != null) {
|
||||
val emoji = nextEvent.getHeaderEmoji(applicationContext)
|
||||
val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.getStartTime() - event.getEndTime())
|
||||
val emoji = nextEvent.getTypeEmoji(applicationContext)
|
||||
val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.time - event.time)
|
||||
nextTextView.text = String.format("%s %s ➡️", time, emoji)
|
||||
nextTextView.setOnClickListener {
|
||||
alertDialog.cancel()
|
||||
@@ -1058,7 +1001,7 @@ class MainActivity : AppCompatActivity() {
|
||||
|
||||
if (DEBUG_CHECK_LOGBOOK_CONSISTENCY) {
|
||||
for (e in logbook?.logs ?: listOf()) {
|
||||
val em = e.getHeaderEmoji(this@MainActivity)
|
||||
val em = e.getTypeEmoji(this@MainActivity)
|
||||
if (em == getString(R.string.event_unknown_type)) {
|
||||
Log.e(TAG, "UNKNOWN: ${e.type}")
|
||||
}
|
||||
@@ -1113,6 +1056,23 @@ class MainActivity : AppCompatActivity() {
|
||||
})
|
||||
}
|
||||
|
||||
fun logEvent(event: LunaEvent) {
|
||||
savingEvent(true)
|
||||
|
||||
event.signature = signature
|
||||
|
||||
setLoading(true)
|
||||
logbook?.logs?.add(0, event)
|
||||
recyclerView.adapter?.notifyItemInserted(0)
|
||||
recyclerView.smoothScrollToPosition(0)
|
||||
saveLogbook(event)
|
||||
|
||||
// Check logbook size to avoid OOM errors
|
||||
if (logbook?.isTooBig() == true) {
|
||||
askToTrimLogbook()
|
||||
}
|
||||
}
|
||||
|
||||
fun deleteEvent(event: LunaEvent) {
|
||||
// Update view
|
||||
savingEvent(true)
|
||||
@@ -1124,32 +1084,6 @@ class MainActivity : AppCompatActivity() {
|
||||
saveLogbook()
|
||||
}
|
||||
|
||||
fun saveEvent(event: LunaEvent) {
|
||||
if (allEvents.contains(event)) {
|
||||
// event was modified
|
||||
logbook?.sort()
|
||||
recyclerView.adapter?.notifyDataSetChanged()
|
||||
saveLogbook()
|
||||
} else {
|
||||
// add new event
|
||||
savingEvent(true)
|
||||
setLoading(true)
|
||||
if (signature.isNotEmpty()) {
|
||||
event.signature = signature
|
||||
}
|
||||
logbook?.logs?.add(0, event)
|
||||
logbook?.sort()
|
||||
recyclerView.adapter?.notifyDataSetChanged()
|
||||
recyclerView.smoothScrollToPosition(0)
|
||||
saveLogbook(event)
|
||||
|
||||
// Check logbook size to avoid OOM errors
|
||||
if (logbook?.isTooBig() == true) {
|
||||
askToTrimLogbook()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Saves the logbook. If saving while adding an event, please specify the event so in case
|
||||
* of error can be removed from the list.
|
||||
@@ -1252,29 +1186,6 @@ class MainActivity : AppCompatActivity() {
|
||||
}
|
||||
}
|
||||
|
||||
private fun showCreateDialog(type: LunaEvent.Type) {
|
||||
val event = LunaEvent(type)
|
||||
when (type) {
|
||||
LunaEvent.Type.BABY_BOTTLE -> addBabyBottleEvent(event)
|
||||
LunaEvent.Type.WEIGHT -> addWeightEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_LEFT_NIPPLE -> addPlainEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_BOTH_NIPPLE -> addPlainEvent(event)
|
||||
LunaEvent.Type.BREASTFEEDING_RIGHT_NIPPLE -> addPlainEvent(event)
|
||||
LunaEvent.Type.DIAPERCHANGE_POO -> addAmountEvent(event)
|
||||
LunaEvent.Type.DIAPERCHANGE_PEE -> addAmountEvent(event)
|
||||
LunaEvent.Type.MEDICINE -> addNoteEvent(event)
|
||||
LunaEvent.Type.ENEMA -> addNoteEvent(event)
|
||||
LunaEvent.Type.NOTE -> addNoteEvent(event)
|
||||
LunaEvent.Type.COLIC -> addPlainEvent(event)
|
||||
LunaEvent.Type.TEMPERATURE -> addTemperatureEvent(event)
|
||||
LunaEvent.Type.FOOD -> addNoteEvent(event)
|
||||
LunaEvent.Type.PUKE -> addAmountEvent(event)
|
||||
LunaEvent.Type.BATH -> addPlainEvent(event)
|
||||
LunaEvent.Type.SLEEP -> addSleepEvent(event)
|
||||
LunaEvent.Type.UNKNOWN -> {} // ignore
|
||||
}
|
||||
}
|
||||
|
||||
private fun showOverflowPopupWindow(anchor: View) {
|
||||
if (showingOverflowPopupWindow)
|
||||
return
|
||||
@@ -1283,19 +1194,51 @@ class MainActivity : AppCompatActivity() {
|
||||
isOutsideTouchable = true
|
||||
val inflater = LayoutInflater.from(anchor.context)
|
||||
contentView = inflater.inflate(R.layout.more_events_popup, null)
|
||||
|
||||
val linearLayout = contentView.findViewById<LinearLayout>(R.id.layout_list)
|
||||
|
||||
// Add buttons to create other events
|
||||
for (type in currentPopupItems) {
|
||||
val view = layoutInflater.inflate(R.layout.more_events_popup_item, linearLayout, false)
|
||||
val textView = view.findViewById<TextView>(R.id.tv)
|
||||
textView.text = LunaEvent.getPopupItemTitle(applicationContext, type)
|
||||
textView.setOnClickListener {
|
||||
showCreateDialog(type)
|
||||
dismiss()
|
||||
contentView.findViewById<View>(R.id.button_medicine).setOnClickListener {
|
||||
addNoteEvent(LunaEvent(LunaEvent.TYPE_MEDICINE))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_enema).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_note).setOnClickListener {
|
||||
addNoteEvent(LunaEvent(LunaEvent.TYPE_NOTE))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_temperature).setOnClickListener {
|
||||
addTemperatureEvent(LunaEvent(LunaEvent.TYPE_TEMPERATURE))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_puke).setOnClickListener {
|
||||
addAmountEvent(LunaEvent(LunaEvent.TYPE_PUKE))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_sleep).setOnClickListener {
|
||||
addSleepEvent(LunaEvent(LunaEvent.TYPE_SLEEP))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_colic).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_COLIC))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_scale).setOnClickListener {
|
||||
addWeightEvent(LunaEvent(LunaEvent.TYPE_WEIGHT))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_bath).setOnClickListener {
|
||||
addPlainEvent(LunaEvent(LunaEvent.TYPE_BATH))
|
||||
dismiss()
|
||||
}
|
||||
contentView.findViewById<View>(R.id.button_statistics).setOnClickListener {
|
||||
if (logbook != null && !pauseLogbookUpdate) {
|
||||
val i = Intent(applicationContext, StatisticsActivity::class.java)
|
||||
i.putExtra("LOOGBOOK_NAME", logbook!!.name)
|
||||
startActivity(i)
|
||||
} else {
|
||||
Toast.makeText(applicationContext, "No logbook selected!", Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
linearLayout.addView(textView)
|
||||
dismiss()
|
||||
}
|
||||
}.also { popupWindow ->
|
||||
popupWindow.setOnDismissListener({
|
||||
|
||||
@@ -4,7 +4,6 @@ import android.os.Bundle
|
||||
import android.view.View
|
||||
import android.widget.EditText
|
||||
import android.widget.RadioButton
|
||||
import android.widget.Spinner
|
||||
import android.widget.TextView
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
@@ -25,7 +24,7 @@ open class SettingsActivity : AppCompatActivity() {
|
||||
protected lateinit var textViewWebDAVUser: TextView
|
||||
protected lateinit var textViewWebDAVPass: TextView
|
||||
protected lateinit var progressIndicator: LinearProgressIndicator
|
||||
protected lateinit var switchDynamicMenu: SwitchMaterial
|
||||
protected lateinit var switchNoBreastfeeding: SwitchMaterial
|
||||
protected lateinit var textViewSignature: EditText
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
@@ -38,7 +37,7 @@ open class SettingsActivity : AppCompatActivity() {
|
||||
textViewWebDAVUser = findViewById(R.id.settings_data_webdav_user)
|
||||
textViewWebDAVPass = findViewById(R.id.settings_data_webdav_pass)
|
||||
progressIndicator = findViewById(R.id.progress_indicator)
|
||||
switchDynamicMenu = findViewById(R.id.switch_dynamic_menu)
|
||||
switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
|
||||
textViewSignature = findViewById(R.id.settings_signature)
|
||||
|
||||
findViewById<View>(R.id.settings_save).setOnClickListener({
|
||||
@@ -55,7 +54,7 @@ open class SettingsActivity : AppCompatActivity() {
|
||||
fun loadSettings() {
|
||||
val dataRepo = settingsRepository.loadDataRepository()
|
||||
val webDavCredentials = settingsRepository.loadWebdavCredentials()
|
||||
val dynamicMenu = settingsRepository.loadDynamicMenu()
|
||||
val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
|
||||
val signature = settingsRepository.loadSignature()
|
||||
|
||||
when (dataRepo) {
|
||||
@@ -64,7 +63,7 @@ open class SettingsActivity : AppCompatActivity() {
|
||||
}
|
||||
|
||||
textViewSignature.setText(signature)
|
||||
switchDynamicMenu.isChecked = dynamicMenu
|
||||
switchNoBreastfeeding.isChecked = noBreastfeeding
|
||||
|
||||
if (webDavCredentials != null) {
|
||||
textViewWebDAVUrl.text = webDavCredentials[0]
|
||||
@@ -161,7 +160,7 @@ open class SettingsActivity : AppCompatActivity() {
|
||||
if (radioDataWebDAV.isChecked) LocalSettingsRepository.DATA_REPO.WEBDAV
|
||||
else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
|
||||
)
|
||||
settingsRepository.saveDynamicMenu(switchDynamicMenu.isChecked)
|
||||
settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
|
||||
settingsRepository.saveSignature(textViewSignature.text.toString())
|
||||
settingsRepository.saveWebdavCredentials(
|
||||
textViewWebDAVUrl.text.toString(),
|
||||
|
||||
@@ -0,0 +1,885 @@
|
||||
package it.danieleverducci.lunatracker
|
||||
|
||||
import android.graphics.Color
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.view.View
|
||||
import android.widget.AdapterView
|
||||
import android.widget.ArrayAdapter
|
||||
import android.widget.Spinner
|
||||
import android.widget.TextView
|
||||
import android.widget.Toast
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import com.github.mikephil.charting.charts.BarChart
|
||||
import com.github.mikephil.charting.data.BarData
|
||||
import com.github.mikephil.charting.data.BarDataSet
|
||||
import com.github.mikephil.charting.data.BarEntry
|
||||
import com.github.mikephil.charting.formatter.ValueFormatter
|
||||
import com.github.mikephil.charting.interfaces.datasets.IBarDataSet
|
||||
import com.thegrizzlylabs.sardineandroid.impl.SardineException
|
||||
import it.danieleverducci.lunatracker.MainActivity.Companion.TAG
|
||||
import it.danieleverducci.lunatracker.entities.Logbook
|
||||
import it.danieleverducci.lunatracker.entities.LunaEvent
|
||||
import it.danieleverducci.lunatracker.repository.FileLogbookRepository
|
||||
import it.danieleverducci.lunatracker.repository.LocalSettingsRepository
|
||||
import it.danieleverducci.lunatracker.repository.LogbookListObtainedListener
|
||||
import it.danieleverducci.lunatracker.repository.LogbookLoadedListener
|
||||
import it.danieleverducci.lunatracker.repository.LogbookRepository
|
||||
import it.danieleverducci.lunatracker.repository.WebDAVLogbookRepository
|
||||
import okio.IOException
|
||||
import org.json.JSONException
|
||||
import utils.DateUtils.Companion.formatTimeDuration
|
||||
import utils.NumericUtils
|
||||
import java.util.Calendar
|
||||
import java.util.Date
|
||||
import kotlin.math.max
|
||||
import kotlin.math.min
|
||||
|
||||
abstract class LogbookBase: AppCompatActivity() {
|
||||
var logbook: Logbook? = null
|
||||
var logbookName: String? = null
|
||||
lateinit var logbookRepo: LogbookRepository
|
||||
|
||||
fun initLogbookBase() {
|
||||
Log.d(TAG, "LogbookBase init")
|
||||
val settingsRepository = LocalSettingsRepository(this)
|
||||
if (settingsRepository.loadDataRepository() == LocalSettingsRepository.DATA_REPO.WEBDAV) {
|
||||
val webDavCredentials = settingsRepository.loadWebdavCredentials()
|
||||
if (webDavCredentials == null) {
|
||||
throw IllegalStateException("Corrupted local settings: repo is webdav, but no webdav login data saved")
|
||||
}
|
||||
logbookRepo = WebDAVLogbookRepository(
|
||||
webDavCredentials[0],
|
||||
webDavCredentials[1],
|
||||
webDavCredentials[2]
|
||||
)
|
||||
} else {
|
||||
logbookRepo = FileLogbookRepository()
|
||||
}
|
||||
|
||||
if (logbook != null) {
|
||||
// Already running: reload data for currently selected logbook
|
||||
loadLogbook(logbook!!.name)
|
||||
} else {
|
||||
// First start: load logbook list
|
||||
loadLogbookList()
|
||||
}
|
||||
}
|
||||
|
||||
abstract fun onLogbookReady()
|
||||
|
||||
fun loadLogbook(name: String) {
|
||||
//if (savingEvent)
|
||||
// return
|
||||
|
||||
// Reset time counter
|
||||
//handler.removeCallbacks(updateListRunnable)
|
||||
//handler.postDelayed(updateListRunnable, UPDATE_EVERY_SECS*1000)
|
||||
|
||||
// Load data
|
||||
//setLoading(true)
|
||||
logbookRepo?.loadLogbook(this, name, object: LogbookLoadedListener{
|
||||
override fun onLogbookLoaded(lb: Logbook) {
|
||||
runOnUiThread({
|
||||
Log.d("StatisticsActivity", "logbook loaded!")
|
||||
//setLoading(false)
|
||||
//findViewById<View>(R.id.no_connection_screen).visibility = View.GONE
|
||||
logbook = lb
|
||||
|
||||
//val events = logbook?.logs ?: arrayListOf()
|
||||
onLogbookReady()//updateGraph() //events) // showLogbook()
|
||||
/*
|
||||
if (DEBUG_CHECK_LOGBOOK_CONSISTENCY) {
|
||||
for (e in logbook?.logs ?: listOf()) {
|
||||
val em = e.getTypeEmoji(this@MainActivity)
|
||||
if (em == getString(R.string.event_unknown_type)) {
|
||||
Log.e(TAG, "UNKNOWN: ${e.type}")
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
})
|
||||
}
|
||||
|
||||
override fun onIOError(error: IOException) {
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(getString(R.string.settings_network_error) + error.toString())
|
||||
})
|
||||
}
|
||||
|
||||
override fun onWebDAVError(error: SardineException) {
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(
|
||||
if(error.toString().contains("401")) {
|
||||
getString(R.string.settings_webdav_error_denied)
|
||||
} else if(error.toString().contains("503")) {
|
||||
getString(R.string.settings_webdav_error_server_offline)
|
||||
} else {
|
||||
getString(R.string.settings_webdav_error_generic) + error.toString()
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
override fun onJSONError(error: JSONException) {
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(getString(R.string.settings_json_error) + error.toString())
|
||||
})
|
||||
}
|
||||
|
||||
override fun onError(error: Exception) {
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(getString(R.string.settings_generic_error) + error.toString())
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun loadLogbookList() {
|
||||
//setLoading(true)
|
||||
logbookRepo?.listLogbooks(this, object: LogbookListObtainedListener {
|
||||
override fun onLogbookListObtained(logbooksNames: ArrayList<String>) {
|
||||
if (logbooksNames.isNotEmpty()) {
|
||||
loadLogbook(logbooksNames[0])
|
||||
}
|
||||
/*
|
||||
runOnUiThread({
|
||||
if (logbooksNames.isEmpty()) {
|
||||
// First run, no logbook: create one
|
||||
//showAddLogbookDialog(false)
|
||||
return@runOnUiThread
|
||||
}
|
||||
// Show logbooks dropdown
|
||||
val spinner = findViewById<Spinner>(R.id.logbooks_spinner)
|
||||
val sAdapter = ArrayAdapter<String>(this@StatisticsActivity, android.R.layout.simple_spinner_item)
|
||||
sAdapter.setDropDownViewResource(R.layout.row_logbook_spinner)
|
||||
for (ln in logbooksNames) {
|
||||
sAdapter.add(
|
||||
ln.ifEmpty { getString(R.string.default_logbook_name) }
|
||||
)
|
||||
}
|
||||
spinner.adapter = sAdapter
|
||||
spinner.onItemSelectedListener = object: AdapterView.OnItemSelectedListener {
|
||||
override fun onItemSelected(
|
||||
parent: AdapterView<*>?,
|
||||
view: View?,
|
||||
position: Int,
|
||||
id: Long
|
||||
) {
|
||||
// Changed logbook: empty list
|
||||
setListAdapter(arrayListOf())
|
||||
// Load logbook
|
||||
loadLogbook(logbooksNames.get(position))
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>?) {}
|
||||
}
|
||||
})
|
||||
*/
|
||||
}
|
||||
|
||||
override fun onIOError(error: IOException) {
|
||||
Log.e(TAG, "Unable to load logbooks list (IOError): $error")
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(getString(R.string.settings_network_error) + error.toString())
|
||||
})
|
||||
}
|
||||
|
||||
override fun onWebDAVError(error: SardineException) {
|
||||
Log.e(TAG, "Unable to load logbooks list (SardineException): $error")
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(
|
||||
if(error.toString().contains("401")) {
|
||||
getString(R.string.settings_webdav_error_denied)
|
||||
} else if(error.toString().contains("503")) {
|
||||
getString(R.string.settings_webdav_error_server_offline)
|
||||
} else {
|
||||
getString(R.string.settings_webdav_error_generic) + error.toString()
|
||||
}
|
||||
)
|
||||
})
|
||||
}
|
||||
|
||||
override fun onError(error: Exception) {
|
||||
Log.e(TAG, "Unable to load logbooks list: $error")
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
onRepoError(getString(R.string.settings_generic_error) + error.toString())
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun onRepoError(message: String) {
|
||||
runOnUiThread({
|
||||
//setLoading(false)
|
||||
//findViewById<View>(R.id.no_connection_screen).visibility = View.VISIBLE
|
||||
//findViewById<TextView>(R.id.no_connection_screen_message).text = message
|
||||
Toast.makeText(this, message, Toast.LENGTH_LONG).show()
|
||||
})
|
||||
}
|
||||
|
||||
fun getAllEvents(): ArrayList<LunaEvent> {
|
||||
return logbook?.logs ?: arrayListOf()
|
||||
}
|
||||
}
|
||||
|
||||
open class StatisticsActivity : LogbookBase() {
|
||||
lateinit var barChart: BarChart
|
||||
lateinit var noDataTextView: TextView
|
||||
lateinit var eventTypeSelection: Spinner
|
||||
lateinit var dataTypeSelection: Spinner
|
||||
lateinit var timeRangeSelection: Spinner
|
||||
|
||||
var eventTypeSelectionValue = "BOTTLE"
|
||||
var dataTypeSelectionValue = "AMOUNT"
|
||||
var timeRangeSelectionValue = "DAY"
|
||||
|
||||
override fun onLogbookReady() {
|
||||
updateGraph()
|
||||
}
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
|
||||
setContentView(R.layout.activity_statistics)
|
||||
|
||||
logbookName = intent.getStringExtra("LOOGBOOK_NAME")
|
||||
if (logbookName == null) {
|
||||
finish()
|
||||
return
|
||||
}
|
||||
|
||||
noDataTextView = findViewById(R.id.no_data)
|
||||
|
||||
barChart = findViewById(R.id.bar_chart)
|
||||
barChart.setBackgroundColor(Color.WHITE)
|
||||
barChart.description.text = "$logbookName"
|
||||
//barChart.description.isEnabled = false
|
||||
barChart.axisLeft.setAxisMinimum(0F)
|
||||
|
||||
/*
|
||||
barChart.setFitBars(true)
|
||||
barChart.setMaxVisibleValueCount(30)
|
||||
|
||||
barChart.axisLeft.setDrawLabels(false)
|
||||
barChart.axisRight.setDrawLabels(true)
|
||||
barChart.xAxis.setDrawLabels(true)
|
||||
barChart.legend.setEnabled(false)
|
||||
barChart.setDrawValueAboveBar(true)
|
||||
//barChart.setVisibleXRangeMaximum(30f)
|
||||
*/
|
||||
|
||||
/*
|
||||
val seekBar = findViewById<SeekBar>(R.id.seekBar);
|
||||
seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
|
||||
override fun onProgressChanged(
|
||||
seekBar: SeekBar?,
|
||||
progress: Int,
|
||||
fromUser: Boolean
|
||||
) {
|
||||
//tvX.setText(java.lang.String.valueOf(seekBar.getProgress()))
|
||||
//tvY.setText(java.lang.String.valueOf(seekBarY.getProgress()))
|
||||
|
||||
//setData(seekBarX.getProgress(), seekBarY.getProgress())
|
||||
barChart.setFitBars(true)
|
||||
barChart.invalidate()
|
||||
}
|
||||
override fun onStartTrackingTouch(seekBar: SeekBar?) {}
|
||||
|
||||
override fun onStopTrackingTouch(seekBar: SeekBar?) {}
|
||||
})
|
||||
*/
|
||||
/*
|
||||
// if more than 60 entries are displayed in the barChart, no values will be
|
||||
// drawn
|
||||
//barChart.setMaxVisibleValueCount(60)
|
||||
|
||||
barChart.setScaleMinima(2f, 1f)
|
||||
|
||||
// scaling can now only be done on x- and y-axis separately
|
||||
barChart.setPinchZoom(true)
|
||||
|
||||
|
||||
// draw shadows for each bar that show the maximum value
|
||||
barChart.setDrawBarShadow(true)
|
||||
barChart.setDrawGridBackground(true)
|
||||
|
||||
val xl = barChart.getXAxis()
|
||||
xl.position = XAxisPosition.BOTTOM
|
||||
//xl.setTypeface(tfLight)
|
||||
xl.setDrawAxisLine(true)
|
||||
xl.setDrawGridLines(false)
|
||||
//xl.setGranularity(10f)
|
||||
|
||||
// yl.setInverted(true);
|
||||
val yr = barChart.axisRight
|
||||
//yr.setTypeface(tfLight)
|
||||
yr.setDrawAxisLine(true)
|
||||
yr.setDrawGridLines(false)
|
||||
yr.setAxisMinimum(0f) // this replaces setStartAtZero(true)
|
||||
|
||||
|
||||
// yr.setInverted(true);
|
||||
barChart.setFitBars(true)
|
||||
barChart.animateY(500)
|
||||
*/
|
||||
eventTypeSelection = findViewById(R.id.type_selection)
|
||||
dataTypeSelection = findViewById(R.id.data_selection)
|
||||
timeRangeSelection = findViewById(R.id.time_selection)
|
||||
|
||||
setupSpinner(eventTypeSelectionValue,
|
||||
R.id.type_selection,
|
||||
R.array.StatisticsTypeLabels,
|
||||
R.array.StatisticsTypeValues,
|
||||
object : SpinnerItemSelected {
|
||||
override fun call(newValue: String?) {
|
||||
if (newValue != null) {
|
||||
eventTypeSelectionValue = newValue
|
||||
Log.d("event", "new value: $newValue")
|
||||
updateGraph()
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
setupSpinner(dataTypeSelectionValue,
|
||||
R.id.data_selection,
|
||||
R.array.StatisticsDataLabels,
|
||||
R.array.StatisticsDataValues,
|
||||
object : SpinnerItemSelected {
|
||||
override fun call(newValue: String?) {
|
||||
if (newValue != null) {
|
||||
dataTypeSelectionValue = newValue
|
||||
Log.d("event", "new value: $newValue")
|
||||
updateGraph()
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
setupSpinner(timeRangeSelectionValue,
|
||||
R.id.time_selection,
|
||||
R.array.StatisticsTimeLabels,
|
||||
R.array.StatisticsTimeValues,
|
||||
object : SpinnerItemSelected {
|
||||
override fun call(newValue: String?) {
|
||||
if (newValue != null) {
|
||||
timeRangeSelectionValue = newValue
|
||||
Log.d("event", "new value: $newValue")
|
||||
updateGraph()
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
initLogbookBase()
|
||||
}
|
||||
|
||||
/*
|
||||
fun massageData(): Triple<Float, Float, Float>
|
||||
Triple(, ,)
|
||||
)
|
||||
*/
|
||||
|
||||
fun updateGraph() {
|
||||
//eventTypeSelectionValue = "SLEEP"
|
||||
//dataTypeSelectionValue = "AMOUNT"
|
||||
//timeRangeSelectionValue = "DAY"
|
||||
|
||||
//val allEvents = getAllEvents()
|
||||
//Log.d("StatisticsActivity", "updateGraph: allEvents: ${allEvents.size}")
|
||||
Log.d("StatisticsActivity", "eventTypeSelectionValue: $eventTypeSelectionValue, dataTypeSelectionValue: $dataTypeSelectionValue, timeRange: $timeRangeSelectionValue")
|
||||
|
||||
// for quantity
|
||||
fun formatEventValue(value: Float): String {
|
||||
return when (eventTypeSelectionValue) {
|
||||
"BOTTLE" -> {
|
||||
NumericUtils(applicationContext).formatEventQuantity(LunaEvent.TYPE_BABY_BOTTLE, value.toInt())
|
||||
}
|
||||
"SLEEP" -> {
|
||||
NumericUtils(applicationContext).formatEventQuantity(LunaEvent.TYPE_SLEEP, value.toInt())
|
||||
}
|
||||
else -> {
|
||||
Log.e(TAG, "invalid dataTypeSelectionValue: $dataTypeSelectionValue")
|
||||
"${value.toInt()}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val eventType = when (eventTypeSelectionValue) {
|
||||
"BOTTLE" -> LunaEvent.TYPE_BABY_BOTTLE
|
||||
"SLEEP" -> LunaEvent.TYPE_SLEEP
|
||||
else -> {
|
||||
Log.e(TAG, "Invalid eventTypeSelectionValue: $eventTypeSelectionValue")
|
||||
return
|
||||
}
|
||||
}
|
||||
val allEvents = getAllEvents().filter { it.type == eventType }.sortedBy { it.time }
|
||||
|
||||
Log.d("StatisticsActivity", "events: ${allEvents.size}")
|
||||
|
||||
val values = ArrayList<BarEntry>()
|
||||
val labels = ArrayList<String>()
|
||||
|
||||
val unixToSpan: ((Long) -> Int) = { unix ->
|
||||
when (timeRangeSelectionValue) {
|
||||
"DAY" -> unixToDays(unix)
|
||||
"WEEK" -> unixToWeeks(unix)
|
||||
"MONTH" -> unixToMonths(unix)
|
||||
else -> {
|
||||
Log.e(TAG, "Invalid timeRangeSelectionValue: $timeRangeSelectionValue")
|
||||
0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val spanToUnix: ((Int) -> Long) = { span ->
|
||||
when (timeRangeSelectionValue) {
|
||||
"DAY" -> daysToUnix(span)
|
||||
"WEEK" -> weeksToUnix(span)
|
||||
"MONTH" -> monthToUnix(span)
|
||||
else -> {
|
||||
Log.e(TAG, "Invalid timeRangeSelectionValue: $timeRangeSelectionValue")
|
||||
0
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun spanToLabel(span: Int): String {
|
||||
//simpleDateFormat = SimpleDateFormat("dd/MM/yyyy")
|
||||
//val dateTime = simpleDateFormat.format(Date(1000 * spanToUnix(span))).toString()
|
||||
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(1000 * spanToUnix(span))
|
||||
val year = dateTime.get(Calendar.YEAR)
|
||||
val month = dateTime.get(Calendar.MONTH) + 1 // month starts at 0
|
||||
val week = dateTime.get(Calendar.WEEK_OF_YEAR)
|
||||
val day = dateTime.get(Calendar.DAY_OF_MONTH)
|
||||
return when (timeRangeSelectionValue) {
|
||||
"DAY" -> "$day/$month/$year"
|
||||
"WEEK" -> "$week/$year"
|
||||
"MONTH" -> "$month/$year"
|
||||
else -> {
|
||||
Log.e(TAG, "Invalid timeRangeSelectionValue: $timeRangeSelectionValue")
|
||||
"?"
|
||||
}
|
||||
}
|
||||
}
|
||||
/*
|
||||
fun calcDay(seconds: Long): Long {
|
||||
val formatter = SimpleDateFormat("yyyy-MM-dd HH:mm")
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(seconds * 1000)
|
||||
val before = formatter.format(dateTime.time)
|
||||
dateTime.set(Calendar.SECOND, 0)
|
||||
dateTime.set(Calendar.MINUTE, 0)
|
||||
dateTime.set(Calendar.HOUR, 0)
|
||||
dateTime.set(Calendar.HOUR_OF_DAY, 0)
|
||||
val after = formatter.format(dateTime.time)
|
||||
//Log.d(TAG, "calcDay: $before -> $after")
|
||||
return dateTime.time.time / 1000
|
||||
}
|
||||
*/
|
||||
|
||||
if (allEvents.isNotEmpty()) {
|
||||
barChart.visibility = View.VISIBLE
|
||||
noDataTextView.visibility = View.GONE
|
||||
|
||||
// unix time span of all events
|
||||
val startUnix = allEvents.minOf { it.time }
|
||||
val endUnix = if (dataTypeSelectionValue == "AMOUNT" && eventTypeSelectionValue == "SLEEP") {
|
||||
allEvents.maxOf { it.time + it.quantity }
|
||||
} else {
|
||||
allEvents.maxOf { it.time }
|
||||
}
|
||||
|
||||
// convert to days, weeks or months
|
||||
val startSpan = unixToSpan(startUnix)
|
||||
val endSpan = unixToSpan(endUnix)
|
||||
|
||||
//Log.d(TAG, "startSpan: $startSpan (${Date(1000 * allEvents.first().time)}), endSpan: $endSpan (${Date(1000 * allEvents.last().time)})")
|
||||
//Log.d(TAG, "start: ${Date(1000 * spanToUnix(startSpan))}, end: ${Date(1000 * spanToUnix(endSpan))}")
|
||||
for (span in startSpan..endSpan + 1) {
|
||||
//Log.d(TAG, "step: ${Date(1000 * daysToUnix(span))}") // todo: checj month
|
||||
values.add(BarEntry(values.size.toFloat(), 0F))
|
||||
labels.add(spanToLabel(span))
|
||||
}
|
||||
|
||||
for (event in allEvents) {
|
||||
if (dataTypeSelectionValue == "AMOUNT") {
|
||||
if (eventTypeSelectionValue == "SLEEP") {
|
||||
// a sleep event can span to another day
|
||||
// distribute sleep time over the days
|
||||
|
||||
// iterate over indexes
|
||||
|
||||
// sleep covers a time range, distribute range of time spans
|
||||
//var mid = spanToUnix(startIndex)
|
||||
|
||||
val startUnix = event.time
|
||||
val endUnix = event.time + event.quantity
|
||||
val begIndex = unixToSpan(startUnix)
|
||||
val endIndex = unixToSpan(endUnix)
|
||||
var mid = startUnix
|
||||
|
||||
Log.d(TAG, "startUnix: ${Date(startUnix * 1000)}, endUnix: ${Date(endUnix * 1000)}, begIndex: $begIndex, endIndex: $endIndex (index diff: ${endIndex - begIndex})")
|
||||
for (i in begIndex..endIndex) {
|
||||
val spanBegin = spanToUnix(i)
|
||||
val spanEnd = spanToUnix(i + 1)
|
||||
Log.d(TAG, "mid: ${Date(mid * 1000)}, spanBegin: ${Date(spanBegin * 1000)}, spanEnd: ${Date(spanEnd * 1000)}, endUnix: ${Date(endUnix * 1000)}")
|
||||
val beg = max(mid, spanBegin)
|
||||
val end = min(endUnix, spanEnd)
|
||||
val index = i - startSpan
|
||||
val duration = end - beg
|
||||
Log.d(TAG, "[$index] beg: ${Date(beg * 1000)}, end: ${Date(end * 1000)}, ${formatTimeDuration(this, duration)}")
|
||||
|
||||
values[index].y += duration
|
||||
mid = end
|
||||
}
|
||||
} else {
|
||||
val index = unixToSpan(event.time) - startSpan
|
||||
values[index].y += event.quantity
|
||||
}
|
||||
} else {
|
||||
val index = unixToSpan(event.time) - startSpan
|
||||
values[index].y += 1
|
||||
}
|
||||
}
|
||||
} else {
|
||||
barChart.visibility = View.GONE
|
||||
noDataTextView.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
val set1 = BarDataSet(values, "sums") // change to "sums", "events", "" and set logbookName to
|
||||
|
||||
set1.setDrawValues(true)
|
||||
set1.setDrawIcons(false)
|
||||
|
||||
//Log.d("StatisticsActivity", "values.size: ${values.size}, labels.size: ${labels.size}")
|
||||
//Log.d("StatisticsActivity", "values: ${values}, labels: ${labels}")
|
||||
|
||||
/*
|
||||
val set1: BarDataSet
|
||||
if (barChart.data != null &&
|
||||
barChart.data.getDataSetCount() > 0
|
||||
) {
|
||||
set1 = barChart.data.getDataSetByIndex(0) as BarDataSet
|
||||
set1.setValues(values)
|
||||
barChart.data.notifyDataChanged()
|
||||
barChart.notifyDataSetChanged()
|
||||
} else {
|
||||
*/
|
||||
|
||||
|
||||
val dataSets = ArrayList<IBarDataSet?>()
|
||||
dataSets.add(set1)
|
||||
|
||||
val data = BarData(dataSets)
|
||||
//data.setValueTextSize(10f)
|
||||
//data.setValueTypeface(tfLight)
|
||||
//data.barWidth = 9f
|
||||
|
||||
|
||||
data.setValueFormatter(object : ValueFormatter() {
|
||||
override fun getFormattedValue(value: Float): String {
|
||||
if (dataTypeSelectionValue == "AMOUNT") {
|
||||
//Log.d(TAG, "formatEventValue: ${formatEventValue(value)}")
|
||||
//Log.d(TAG, "data.setValueFormatter")
|
||||
return formatEventValue(value)
|
||||
} else {
|
||||
return value.toInt().toString()
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
//barChart.xAxis.setLabelsToSkip(0)
|
||||
|
||||
//val leftAxis = barChart.axisLeft
|
||||
//barChart.xAxis.setLabelCount(values.size)
|
||||
barChart.axisRight.setDrawLabels(false)
|
||||
barChart.axisLeft.setDrawLabels(false)
|
||||
|
||||
barChart.xAxis.valueFormatter = object : ValueFormatter() {
|
||||
override fun getFormattedValue(value: Float): String {
|
||||
//Log.d("labels", "labels: ${value.toInt()}")
|
||||
return labels.getOrElse(value.toInt(), {"?"})
|
||||
}
|
||||
}
|
||||
|
||||
//val labelsTmp = values.map { "${it.y.toInt()} ml" } // ArrayList<String>()
|
||||
//Log.d("StatisticsActivity", "labels: $labelsTmp")
|
||||
//barChart.xAxis.setGranularity(1f)
|
||||
//barChart.xAxis.isGranularityEnabled = true
|
||||
//barChart.xAxis.setValueFormatter(IndexAxisValueFormatter(labels))
|
||||
/*
|
||||
barChart.axisRight.valueFormatter = object : ValueFormatter() {
|
||||
override fun getFormattedValue(value: Float): String {
|
||||
//Log.d(TAG, "formatEventValue: ${formatEventValue(value)}")
|
||||
return formatEventValue(value)
|
||||
}
|
||||
}
|
||||
*/
|
||||
//barChart.axisRight.setGranularity(1.0f)
|
||||
//barChart.axisRight.isGranularityEnabled = true
|
||||
/*
|
||||
barChart.getYLabels().valueFormatter = object : ValueFormatter() {
|
||||
override fun getFormattedValue(value: Float): String {
|
||||
Log.d("StatisticsActivity", "y value: $value")
|
||||
return value.toString() + "ml"
|
||||
}
|
||||
}
|
||||
*/
|
||||
//barChart.axisLeft.textColor = Color.WHITE
|
||||
//barChart.axisRight.textColor = Color.WHITE
|
||||
//barChart.setNoDataTextColor(Color.RED)
|
||||
//barChart.setBackgroundColor()
|
||||
|
||||
//data.setValueTextSize(10f)
|
||||
//data.setValueTypeface(tfLight)
|
||||
//data.setBarWidth(9f)
|
||||
//data.setValueTextColor(Color.WHITE)
|
||||
data.setValueTextSize(12f)
|
||||
barChart.setData(data)
|
||||
barChart.invalidate()
|
||||
//}
|
||||
}
|
||||
|
||||
private interface SpinnerItemSelected {
|
||||
fun call(newValue: String?)
|
||||
}
|
||||
|
||||
private fun setupSpinner(
|
||||
currentValue: String,
|
||||
spinnerId: Int,
|
||||
arrayId: Int,
|
||||
arrayValuesId: Int,
|
||||
callback: SpinnerItemSelected
|
||||
) {
|
||||
val arrayValues = resources.getStringArray(arrayValuesId)
|
||||
val spinner = findViewById<Spinner>(spinnerId)
|
||||
val spinnerAdapter =
|
||||
ArrayAdapter.createFromResource(this, arrayId, R.layout.statistics_spinner_item) //android.R.layout.simple_spinner_item) //android.R.layout.simple_list_item_single_choice) //R.layout.spinner_item_settings)
|
||||
|
||||
spinner.adapter = spinnerAdapter
|
||||
spinner.setSelection(arrayValues.indexOf(currentValue))
|
||||
spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
|
||||
var check = 0
|
||||
override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) {
|
||||
if (pos >= arrayValues.size) {
|
||||
Toast.makeText(
|
||||
this@StatisticsActivity,
|
||||
"pos out of bounds: $arrayValues", Toast.LENGTH_SHORT
|
||||
).show()
|
||||
return
|
||||
}
|
||||
if (check++ > 0) {
|
||||
callback.call(arrayValues[pos])
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNothingSelected(parent: AdapterView<*>?) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
fun loadSettings() {
|
||||
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) {
|
||||
textViewWebDAVUrl.text = webDavCredentials[0]
|
||||
textViewWebDAVUser.text = webDavCredentials[1]
|
||||
textViewWebDAVPass.text = webDavCredentials[2]
|
||||
}
|
||||
}
|
||||
|
||||
fun validateAndSave() {
|
||||
if (radioDataLocal.isChecked) {
|
||||
// No validation required, just save
|
||||
saveSettings()
|
||||
return
|
||||
}
|
||||
|
||||
// Try to connect to WebDAV and check if the save file already exists
|
||||
val webDAVLogbookRepo = WebDAVLogbookRepository(
|
||||
textViewWebDAVUrl.text.toString(),
|
||||
textViewWebDAVUser.text.toString(),
|
||||
textViewWebDAVPass.text.toString()
|
||||
)
|
||||
progressIndicator.visibility = View.VISIBLE
|
||||
|
||||
webDAVLogbookRepo.listLogbooks(this, object: LogbookListObtainedListener{
|
||||
|
||||
override fun onLogbookListObtained(logbooksNames: ArrayList<String>) {
|
||||
if (logbooksNames.isEmpty()) {
|
||||
// TODO: Ask the user if he wants to upload the local ones or to create a new one
|
||||
copyLocalLogbooksToWebdav(webDAVLogbookRepo, object: OnCopyLocalLogbooksToWebdavFinishedListener {
|
||||
|
||||
override fun onCopyLocalLogbooksToWebdavFinished(errors: String?) {
|
||||
runOnUiThread({
|
||||
progressIndicator.visibility = View.INVISIBLE
|
||||
if (errors == null) {
|
||||
saveSettings()
|
||||
Toast.makeText(this@SettingsActivity, R.string.settings_webdav_creation_ok, Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
Toast.makeText(this@SettingsActivity, errors, Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
})
|
||||
} else {
|
||||
runOnUiThread({
|
||||
progressIndicator.visibility = View.INVISIBLE
|
||||
saveSettings()
|
||||
Toast.makeText(this@SettingsActivity, R.string.settings_webdav_creation_ok, Toast.LENGTH_SHORT).show()
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
override fun onIOError(error: IOException) {
|
||||
runOnUiThread({
|
||||
progressIndicator.visibility = View.INVISIBLE
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.settings_network_error) + error.toString(), Toast.LENGTH_SHORT).show()
|
||||
})
|
||||
}
|
||||
|
||||
override fun onWebDAVError(error: SardineException) {
|
||||
runOnUiThread({
|
||||
progressIndicator.visibility = View.INVISIBLE
|
||||
if(error.toString().contains("401")) {
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.settings_webdav_error_denied), Toast.LENGTH_SHORT).show()
|
||||
} else {
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.settings_webdav_error_generic) + error.toString(), Toast.LENGTH_SHORT).show()
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
override fun onError(error: Exception) {
|
||||
runOnUiThread({
|
||||
progressIndicator.visibility = View.INVISIBLE
|
||||
Toast.makeText(this@SettingsActivity, getString(R.string.settings_generic_error) + error.toString(), Toast.LENGTH_SHORT).show()
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
fun saveSettings() {
|
||||
settingsRepository.saveDataRepository(
|
||||
if (radioDataWebDAV.isChecked) LocalSettingsRepository.DATA_REPO.WEBDAV
|
||||
else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
|
||||
)
|
||||
settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
|
||||
settingsRepository.saveSignature(textViewSignature.text.toString())
|
||||
settingsRepository.saveWebdavCredentials(
|
||||
textViewWebDAVUrl.text.toString(),
|
||||
textViewWebDAVUser.text.toString(),
|
||||
textViewWebDAVPass.text.toString()
|
||||
)
|
||||
finish()
|
||||
}
|
||||
|
||||
private fun copyLocalLogbooksToWebdav(webDAVLogbookRepository: WebDAVLogbookRepository, listener: OnCopyLocalLogbooksToWebdavFinishedListener) {
|
||||
Thread(Runnable {
|
||||
val errors = StringBuilder()
|
||||
val fileLogbookRepo = FileLogbookRepository()
|
||||
val logbooks = fileLogbookRepo.getAllLogbooks(this)
|
||||
for (logbook in logbooks) {
|
||||
// Copy only if does not already exist
|
||||
val error = webDAVLogbookRepository.uploadLogbookIfNotExists(this, logbook.name)
|
||||
if (error != null) {
|
||||
if (errors.isNotEmpty())
|
||||
errors.append("\n")
|
||||
errors.append(String.format(getString(R.string.settings_webdav_upload_error), logbook.name, error))
|
||||
}
|
||||
}
|
||||
listener.onCopyLocalLogbooksToWebdavFinished(
|
||||
if (errors.isEmpty()) null else errors.toString()
|
||||
)
|
||||
}).start()
|
||||
}
|
||||
|
||||
private interface OnCopyLocalLogbooksToWebdavFinishedListener {
|
||||
fun onCopyLocalLogbooksToWebdavFinished(errors: String?)
|
||||
}
|
||||
*/
|
||||
|
||||
companion object {
|
||||
fun unixToMonths(seconds: Long): Int {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(seconds * 1000)
|
||||
val years = dateTime.get(Calendar.YEAR)
|
||||
val months = dateTime.get(Calendar.MONTH) // January is 0
|
||||
return 12 * years + 1 + months
|
||||
}
|
||||
|
||||
fun monthToUnix(months: Int): Long {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(0)
|
||||
dateTime.set(Calendar.YEAR, months / 12)
|
||||
dateTime.set(Calendar.MONTH, months % 12)
|
||||
dateTime.set(Calendar.HOUR, 0)
|
||||
dateTime.set(Calendar.MINUTE, 0)
|
||||
dateTime.set(Calendar.SECOND, 0)
|
||||
return dateTime.time.time / 1000
|
||||
}
|
||||
|
||||
fun unixToWeeks(seconds: Long): Int {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(seconds * 1000)
|
||||
val years = dateTime.get(Calendar.YEAR)
|
||||
val weeks = dateTime.get(Calendar.WEEK_OF_YEAR)
|
||||
return 52 * years + weeks
|
||||
}
|
||||
|
||||
fun weeksToUnix(weeks: Int): Long {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(0)
|
||||
dateTime.set(Calendar.YEAR, weeks / 52)
|
||||
dateTime.set(Calendar.DAY_OF_YEAR, weeks % 52)
|
||||
dateTime.set(Calendar.HOUR, 0)
|
||||
dateTime.set(Calendar.MINUTE, 0)
|
||||
dateTime.set(Calendar.SECOND, 0)
|
||||
return dateTime.time.time / 1000
|
||||
}
|
||||
|
||||
fun unixToDays(seconds: Long): Int {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(seconds * 1000)
|
||||
val years = dateTime.get(Calendar.YEAR)
|
||||
val days = dateTime.get(Calendar.DAY_OF_YEAR)
|
||||
return 365 * years + days
|
||||
}
|
||||
|
||||
// convert from days to Date
|
||||
fun daysToUnix(days: Int): Long {
|
||||
val dateTime = Calendar.getInstance()
|
||||
dateTime.time = Date(0)
|
||||
dateTime.set(Calendar.YEAR, days / 365)
|
||||
dateTime.set(Calendar.DAY_OF_YEAR, days % 365)
|
||||
dateTime.set(Calendar.HOUR, 0)
|
||||
dateTime.set(Calendar.MINUTE, 0)
|
||||
dateTime.set(Calendar.SECOND, 0)
|
||||
return dateTime.time.time / 1000
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -52,17 +52,18 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
|
||||
)
|
||||
holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.textColor))
|
||||
// Contents
|
||||
holder.type.text = item.getHeaderEmoji(context)
|
||||
holder.type.text = item.getTypeEmoji(context)
|
||||
holder.description.text = when (item.type) {
|
||||
LunaEvent.Type.MEDICINE -> item.notes
|
||||
LunaEvent.Type.NOTE -> item.notes
|
||||
else -> item.getRowItemTitle(context)
|
||||
LunaEvent.TYPE_MEDICINE -> item.notes
|
||||
LunaEvent.TYPE_NOTE -> item.notes
|
||||
LunaEvent.TYPE_CUSTOM -> item.notes
|
||||
else -> item.getTypeDescription(context)
|
||||
}
|
||||
holder.time.text = DateUtils.formatTimeAgo(context, item.getEndTime())
|
||||
holder.time.text = DateUtils.formatTimeAgo(context, item.time)
|
||||
var quantityText = numericUtils.formatEventQuantity(item)
|
||||
|
||||
// if the event is weight, show difference with the last one
|
||||
if (item.type == LunaEvent.Type.WEIGHT) {
|
||||
if (item.type == LunaEvent.TYPE_WEIGHT) {
|
||||
val lastWeight = getPreviousWeightEvent(position)
|
||||
if (lastWeight != null) {
|
||||
val differenceInWeight = item.quantity - lastWeight.quantity
|
||||
@@ -93,7 +94,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
|
||||
return null
|
||||
for (pos in startFromPosition + 1 until items.size) {
|
||||
val item = items.get(pos)
|
||||
if (item.type != LunaEvent.Type.WEIGHT)
|
||||
if (item.type != LunaEvent.TYPE_WEIGHT)
|
||||
continue
|
||||
return item
|
||||
}
|
||||
|
||||
@@ -12,24 +12,25 @@ import java.util.Date
|
||||
* release, it is simply ignored by previous ones).
|
||||
*/
|
||||
class LunaEvent: Comparable<LunaEvent> {
|
||||
enum class Type {
|
||||
BABY_BOTTLE,
|
||||
FOOD,
|
||||
BREASTFEEDING_LEFT_NIPPLE,
|
||||
BREASTFEEDING_BOTH_NIPPLE,
|
||||
BREASTFEEDING_RIGHT_NIPPLE,
|
||||
DIAPERCHANGE_POO,
|
||||
DIAPERCHANGE_PEE,
|
||||
SLEEP,
|
||||
WEIGHT,
|
||||
MEDICINE,
|
||||
ENEMA,
|
||||
NOTE,
|
||||
COLIC,
|
||||
TEMPERATURE,
|
||||
PUKE,
|
||||
BATH,
|
||||
UNKNOWN
|
||||
|
||||
companion object {
|
||||
const val TYPE_BABY_BOTTLE = "BABY_BOTTLE"
|
||||
const val TYPE_WEIGHT = "WEIGHT"
|
||||
const val TYPE_BREASTFEEDING_LEFT_NIPPLE = "BREASTFEEDING_LEFT_NIPPLE"
|
||||
const val TYPE_BREASTFEEDING_BOTH_NIPPLE = "BREASTFEEDING_BOTH_NIPPLE"
|
||||
const val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
|
||||
const val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
|
||||
const val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
|
||||
const val TYPE_MEDICINE = "MEDICINE"
|
||||
const val TYPE_ENEMA = "ENEMA"
|
||||
const val TYPE_NOTE = "NOTE"
|
||||
const val TYPE_CUSTOM = "CUSTOM"
|
||||
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"
|
||||
const val TYPE_SLEEP = "SLEEP"
|
||||
}
|
||||
|
||||
private val jo: JSONObject
|
||||
@@ -39,16 +40,10 @@ class LunaEvent: Comparable<LunaEvent> {
|
||||
set(value) {
|
||||
jo.put("time", value)
|
||||
}
|
||||
var type: Type
|
||||
get(): Type {
|
||||
return try {
|
||||
Type.valueOf(jo.getString("type"))
|
||||
} catch (_: Exception) {
|
||||
Type.UNKNOWN
|
||||
}
|
||||
}
|
||||
var type: String
|
||||
get(): String = jo.getString("type")
|
||||
set(value) {
|
||||
jo.put("type", value.name)
|
||||
jo.put("type", value)
|
||||
}
|
||||
var quantity: Int
|
||||
get() = jo.optInt("quantity")
|
||||
@@ -86,45 +81,81 @@ class LunaEvent: Comparable<LunaEvent> {
|
||||
this.signature = event.signature
|
||||
}
|
||||
|
||||
constructor(type: Type) {
|
||||
constructor(type: String) {
|
||||
this.jo = JSONObject()
|
||||
this.time = System.currentTimeMillis() / 1000
|
||||
this.type = type
|
||||
}
|
||||
|
||||
constructor(type: Type, quantity: Int) {
|
||||
constructor(type: String, quantity: Int) {
|
||||
this.jo = JSONObject()
|
||||
this.time = System.currentTimeMillis() / 1000
|
||||
this.type = type
|
||||
this.quantity = quantity
|
||||
}
|
||||
|
||||
fun getHeaderEmoji(context: Context): String {
|
||||
return getHeaderEmoji(context, type)
|
||||
fun getTypeEmoji(context: Context): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
TYPE_BABY_BOTTLE -> R.string.event_bottle_type
|
||||
TYPE_WEIGHT -> R.string.event_weight_type
|
||||
TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
|
||||
TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
|
||||
TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
|
||||
TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
|
||||
TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
|
||||
TYPE_MEDICINE -> R.string.event_medicine_type
|
||||
TYPE_ENEMA -> R.string.event_enema_type
|
||||
TYPE_NOTE -> R.string.event_note_type
|
||||
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
|
||||
TYPE_SLEEP -> R.string.event_sleep_type
|
||||
else -> R.string.event_unknown_type
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun getDialogTitle(context: Context): String {
|
||||
return getDialogTitle(context, type)
|
||||
fun getTypeDescription(context: Context): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
|
||||
TYPE_WEIGHT -> R.string.event_weight_desc
|
||||
TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
|
||||
TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
|
||||
TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
|
||||
TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
|
||||
TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
|
||||
TYPE_MEDICINE -> R.string.event_medicine_desc
|
||||
TYPE_ENEMA -> R.string.event_enema_desc
|
||||
TYPE_NOTE -> R.string.event_note_desc
|
||||
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
|
||||
TYPE_SLEEP -> R.string.event_sleep_desc
|
||||
else -> R.string.event_unknown_desc
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun getRowItemTitle(context: Context): String {
|
||||
return getPopupItemTitle(context, type).split(" ", limit = 2).last() // remove emoji
|
||||
}
|
||||
|
||||
fun getDialogMessage(context: Context): String {
|
||||
return getDialogMessage(context, type)
|
||||
}
|
||||
|
||||
fun getStartTime(): Long {
|
||||
return time
|
||||
}
|
||||
|
||||
fun getEndTime(): Long {
|
||||
return if (type == Type.SLEEP) {
|
||||
time + quantity
|
||||
} else {
|
||||
time
|
||||
}
|
||||
fun getDialogMessage(context: Context): String? {
|
||||
return context.getString(
|
||||
when(type) {
|
||||
TYPE_BABY_BOTTLE -> R.string.log_bottle_dialog_description
|
||||
TYPE_MEDICINE -> R.string.log_medicine_dialog_description
|
||||
TYPE_TEMPERATURE -> R.string.log_temperature_dialog_description
|
||||
TYPE_DIAPERCHANGE_POO,
|
||||
TYPE_DIAPERCHANGE_PEE,
|
||||
TYPE_PUKE -> R.string.log_amount_dialog_description
|
||||
TYPE_WEIGHT -> R.string.log_weight_dialog_description
|
||||
TYPE_SLEEP -> R.string.log_sleep_dialog_description
|
||||
else -> R.string.log_unknown_dialog_description
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun toJson(): JSONObject {
|
||||
@@ -138,95 +169,4 @@ class LunaEvent: Comparable<LunaEvent> {
|
||||
override fun compareTo(other: LunaEvent): Int {
|
||||
return (this.time - other.time).toInt()
|
||||
}
|
||||
|
||||
companion object {
|
||||
fun getHeaderEmoji(context: Context, type: Type): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
Type.BABY_BOTTLE -> R.string.event_bottle_type
|
||||
Type.WEIGHT -> R.string.event_weight_type
|
||||
Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
|
||||
Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
|
||||
Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
|
||||
Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
|
||||
Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
|
||||
Type.MEDICINE -> R.string.event_medicine_type
|
||||
Type.ENEMA -> R.string.event_enema_type
|
||||
Type.NOTE -> R.string.event_note_type
|
||||
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
|
||||
Type.SLEEP -> R.string.event_sleep_type
|
||||
Type.UNKNOWN -> R.string.event_unknown_type
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun getDialogMessage(context: Context, type: Type): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
Type.BABY_BOTTLE -> R.string.log_bottle_dialog_description
|
||||
Type.MEDICINE -> R.string.log_medicine_dialog_description
|
||||
Type.TEMPERATURE -> R.string.log_temperature_dialog_description
|
||||
Type.DIAPERCHANGE_POO,
|
||||
Type.DIAPERCHANGE_PEE,
|
||||
Type.PUKE -> R.string.log_amount_dialog_description
|
||||
Type.WEIGHT -> R.string.log_weight_dialog_description
|
||||
Type.SLEEP -> R.string.log_sleep_dialog_description
|
||||
else -> R.string.log_unknown_dialog_description
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
fun getDialogTitle(context: Context, type: Type): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
Type.BABY_BOTTLE -> R.string.event_bottle_desc
|
||||
Type.WEIGHT -> R.string.event_weight_desc
|
||||
Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
|
||||
Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
|
||||
Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
|
||||
Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
|
||||
Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
|
||||
Type.MEDICINE -> R.string.event_medicine_desc
|
||||
Type.ENEMA -> R.string.event_enema_desc
|
||||
Type.NOTE -> R.string.event_note_desc
|
||||
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
|
||||
Type.SLEEP -> R.string.event_sleep_desc
|
||||
Type.UNKNOWN -> R.string.event_unknown_desc
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
// Entries for for popup list
|
||||
fun getPopupItemTitle(context: Context, type: Type): String {
|
||||
return context.getString(
|
||||
when (type) {
|
||||
Type.BABY_BOTTLE -> R.string.event_type_item_bottle
|
||||
Type.WEIGHT -> R.string.event_type_item_weight
|
||||
Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_type_item_breastfeeding_left
|
||||
Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_type_item_breastfeeding_both
|
||||
Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_type_item_breastfeeding_right
|
||||
Type.DIAPERCHANGE_POO -> R.string.event_type_item_diaperchange_poo
|
||||
Type.DIAPERCHANGE_PEE -> R.string.event_type_item_diaperchange_pee
|
||||
Type.MEDICINE -> R.string.event_type_item_medicine
|
||||
Type.ENEMA -> R.string.event_type_item_enema
|
||||
Type.NOTE -> R.string.event_type_item_note
|
||||
Type.TEMPERATURE -> R.string.event_type_item_temperature
|
||||
Type.COLIC -> R.string.event_type_item_colic
|
||||
Type.FOOD -> R.string.event_type_item_food
|
||||
Type.PUKE -> R.string.event_type_item_puke
|
||||
Type.BATH -> R.string.event_type_item_bath
|
||||
Type.SLEEP -> R.string.event_type_item_sleep
|
||||
Type.UNKNOWN -> R.string.event_type_item_unknown
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ class LocalSettingsRepository(val context: Context) {
|
||||
const val SHARED_PREFS_DAV_URL = "webdav_url"
|
||||
const val SHARED_PREFS_DAV_USER = "webdav_user"
|
||||
const val SHARED_PREFS_DAV_PASS = "webdav_password"
|
||||
const val SHARED_PREFS_DYNAMIC_MENU = "dynamic_menu"
|
||||
const val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
|
||||
const val SHARED_PREFS_SIGNATURE = "signature"
|
||||
}
|
||||
enum class DATA_REPO {LOCAL_FILE, WEBDAV}
|
||||
@@ -31,12 +31,12 @@ class LocalSettingsRepository(val context: Context) {
|
||||
return sharedPreferences.getString(SHARED_PREFS_SIGNATURE, "") ?: ""
|
||||
}
|
||||
|
||||
fun saveDynamicMenu(content: Boolean) {
|
||||
sharedPreferences.edit { putBoolean(SHARED_PREFS_DYNAMIC_MENU, content) }
|
||||
fun saveNoBreastfeeding(content: Boolean) {
|
||||
sharedPreferences.edit { putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content) }
|
||||
}
|
||||
|
||||
fun loadDynamicMenu(): Boolean {
|
||||
return sharedPreferences.getBoolean(SHARED_PREFS_DYNAMIC_MENU, false)
|
||||
fun loadNoBreastfeeding(): Boolean {
|
||||
return sharedPreferences.getBoolean(SHARED_PREFS_NO_BREASTFEEDING, false)
|
||||
}
|
||||
|
||||
fun saveDataRepository(repo: DATA_REPO) {
|
||||
|
||||
@@ -56,11 +56,11 @@ class DateUtils {
|
||||
return builder.toString()
|
||||
}
|
||||
|
||||
if (years != 0L) {
|
||||
if (years > 0) {
|
||||
return format(years, days, R.string.year_ago, R.string.years_ago, R.string.day_ago, R.string.days_ago)
|
||||
} else if (days != 0L) {
|
||||
} else if (days > 0) {
|
||||
return format(days, hours, R.string.day_ago, R.string.days_ago, R.string.hour_ago, R.string.hours_ago)
|
||||
} else if (hours != 0L) {
|
||||
} else if (hours > 0) {
|
||||
return format(hours, minutes, R.string.hour_ago, R.string.hours_ago, R.string.minute_ago, R.string.minutes_ago)
|
||||
} else {
|
||||
return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
|
||||
|
||||
@@ -66,51 +66,51 @@ class NumericUtils (val context: Context) {
|
||||
return formatEventQuantity(event.type, event.quantity)
|
||||
}
|
||||
|
||||
fun formatEventQuantity(type: LunaEvent.Type, quantity: Int): String {
|
||||
fun formatEventQuantity(type: String, quantity: Int): String {
|
||||
val formatted = StringBuilder()
|
||||
if (quantity > 0) {
|
||||
formatted.append(when (type) {
|
||||
LunaEvent.Type.TEMPERATURE ->
|
||||
LunaEvent.TYPE_TEMPERATURE ->
|
||||
(quantity / 10.0f).toString()
|
||||
LunaEvent.Type.DIAPERCHANGE_POO,
|
||||
LunaEvent.Type.DIAPERCHANGE_PEE,
|
||||
LunaEvent.Type.PUKE -> {
|
||||
LunaEvent.TYPE_DIAPERCHANGE_POO,
|
||||
LunaEvent.TYPE_DIAPERCHANGE_PEE,
|
||||
LunaEvent.TYPE_PUKE -> {
|
||||
val array = context.resources.getStringArray(R.array.AmountLabels)
|
||||
return array.getOrElse(quantity) {
|
||||
Log.e("NumericUtils", "Invalid index $quantity")
|
||||
return ""
|
||||
}
|
||||
}
|
||||
LunaEvent.Type.SLEEP -> formatTimeDuration(context, quantity.toLong())
|
||||
LunaEvent.TYPE_SLEEP -> formatTimeDuration(context, quantity.toLong())
|
||||
else -> quantity
|
||||
})
|
||||
|
||||
formatted.append(" ")
|
||||
formatted.append(
|
||||
when (type) {
|
||||
LunaEvent.Type.BABY_BOTTLE -> measurement_unit_liquid_base
|
||||
LunaEvent.Type.WEIGHT -> measurement_unit_weight_base
|
||||
LunaEvent.Type.MEDICINE -> measurement_unit_weight_tiny
|
||||
LunaEvent.Type.TEMPERATURE -> measurement_unit_temperature_base
|
||||
LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
|
||||
LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
|
||||
LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
|
||||
LunaEvent.TYPE_TEMPERATURE -> measurement_unit_temperature_base
|
||||
else -> ""
|
||||
}
|
||||
)
|
||||
} else {
|
||||
formatted.append(when (type) {
|
||||
LunaEvent.Type.SLEEP -> "💤" // baby is sleeping
|
||||
LunaEvent.TYPE_SLEEP -> "💤" // baby is sleeping
|
||||
else -> ""
|
||||
})
|
||||
}
|
||||
return formatted.toString().trim()
|
||||
return formatted.toString()
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns a valid quantity range for the event type.
|
||||
* @return min, max, normal
|
||||
*/
|
||||
fun getValidEventQuantityRange(lunaEventType: LunaEvent.Type): Triple<Int, Int, Int>? {
|
||||
fun getValidEventQuantityRange(lunaEventType: String): Triple<Int, Int, Int>? {
|
||||
return when (lunaEventType) {
|
||||
LunaEvent.Type.TEMPERATURE -> {
|
||||
LunaEvent.TYPE_TEMPERATURE -> {
|
||||
if (isMetricSystem())
|
||||
Triple(
|
||||
context.resources.getInteger(R.integer.human_body_temp_min_metric),
|
||||
|
||||
5
app/src/main/res/drawable/ic_more.xml
Normal file
5
app/src/main/res/drawable/ic_more.xml
Normal file
@@ -0,0 +1,5 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
|
||||
|
||||
</vector>
|
||||
@@ -86,16 +86,15 @@
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linear_layout_row1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button1_row1"
|
||||
android:id="@+id/button_bottle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:layout_weight="2"
|
||||
android:layout_margin="5dp"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
@@ -103,7 +102,7 @@
|
||||
android:text="@string/event_bottle_type"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button2_row1"
|
||||
android:id="@+id/button_food"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
@@ -116,69 +115,12 @@
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linear_layout_row2"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/layout_nipples">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button1_row2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button2_row2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button3_row2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linear_layout_row3"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button1_row3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button2_row3"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_more"
|
||||
android:id="@+id/button_nipple_left"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
@@ -186,7 +128,67 @@
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"
|
||||
android:text="☰"
|
||||
android:text="🤱⬅️"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_nipple_both"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"
|
||||
android:text="🤱↔️"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_nipple_right"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"
|
||||
android:text="🤱➡️️"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_change_poo"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"
|
||||
android:text="🚼 💩"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_change_pee"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="2"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:textSize="30sp"
|
||||
android:text="🚼 💧"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/button_more"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_margin="5dp"
|
||||
android:layout_weight="1"
|
||||
android:background="@drawable/button_background"
|
||||
android:gravity="center_horizontal"
|
||||
android:src="@drawable/ic_more"
|
||||
app:tint="@android:color/darker_gray"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@@ -137,7 +137,7 @@
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="@string/settings_signature_desc"/>
|
||||
|
||||
@@ -149,13 +149,13 @@
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:textStyle="bold"
|
||||
android:text="@string/settings_dynamic_menu" />
|
||||
android:text="@string/settings_no_breastfeeding" />
|
||||
|
||||
<com.google.android.material.switchmaterial.SwitchMaterial
|
||||
android:id="@+id/switch_dynamic_menu"
|
||||
android:id="@+id/switch_no_breastfeeding"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="20dp"
|
||||
@@ -166,9 +166,9 @@
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="20dp"
|
||||
android:layout_marginStart="30dp"
|
||||
android:layout_marginTop="5dp"
|
||||
android:text="@string/settings_dynamic_menu_desc"/>
|
||||
android:text="@string/settings_no_breastfeeding_desc"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
||||
55
app/src/main/res/layout/activity_statistics.xml
Normal file
55
app/src/main/res/layout/activity_statistics.xml
Normal file
@@ -0,0 +1,55 @@
|
||||
<?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:orientation="vertical"
|
||||
android:padding="10dp">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<com.github.mikephil.charting.charts.HorizontalBarChart
|
||||
android:id="@+id/bar_chart"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/no_data"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="gone"
|
||||
android:gravity="center"
|
||||
android:text="No Data"/>
|
||||
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:layout_marginTop="10dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/type_selection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/data_selection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/time_selection"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@@ -7,23 +7,46 @@
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_date_picker_begin"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="10dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_date_duration"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="20dp"
|
||||
android:textSize="20sp"
|
||||
android:text="💤"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginHorizontal="10dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/dialog_date_duration_minus5"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="-5"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/dialog_date_duration_now"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/now"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/dialog_date_duration_plus5"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="+5"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/dialog_date_picker_end"
|
||||
android:id="@+id/dialog_date_picker"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
|
||||
@@ -6,11 +6,110 @@
|
||||
android:background="@color/transparent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layout_list"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<!-- Buttons are inserted dynamically -->
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_statistics"
|
||||
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="📊 Statistics"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_medicine"
|
||||
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_medicine"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_note"
|
||||
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_note"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_temperature"
|
||||
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_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_sleep"
|
||||
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_sleep"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_colic"
|
||||
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_colic"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/button_scale"
|
||||
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_weight"/>
|
||||
|
||||
<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>
|
||||
@@ -1,11 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TextView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/tv"
|
||||
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="Item Template"/>
|
||||
@@ -18,6 +18,13 @@
|
||||
<string name="event_colic_desc">Blähungskolik</string>
|
||||
<string name="event_unknown_desc"></string>
|
||||
|
||||
<string name="overflow_event_weight">⚖️ Gewicht</string>
|
||||
<string name="overflow_event_medicine">💊 Medikament</string>
|
||||
<string name="overflow_event_enema">🪠 Einlauf</string>
|
||||
<string name="overflow_event_note">📝 Notiz</string>
|
||||
<string name="overflow_event_temperature">🌡️ Temperatur</string>
|
||||
<string name="overflow_event_colic">💨 Blähungskolik</string>
|
||||
|
||||
<string name="toast_event_added">Ereignis gespeichert</string>
|
||||
<string name="toast_logbook_saved">Logbuch gespeichert</string>
|
||||
<string name="toast_event_add_error">Ereignis konnte nicht protokolliert werden</string>
|
||||
@@ -35,6 +42,7 @@
|
||||
<string name="no_connection_retry">Erneut versuchen</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>
|
||||
|
||||
@@ -18,6 +18,13 @@
|
||||
<string name="event_colic_desc">Colique gazeuse</string>
|
||||
<string name="event_unknown_desc"></string>
|
||||
|
||||
<string name="overflow_event_weight">⚖️ Poids</string>
|
||||
<string name="overflow_event_medicine">💊 Médicament</string>
|
||||
<string name="overflow_event_enema">🪠 Lavement</string>
|
||||
<string name="overflow_event_note">📝 Note</string>
|
||||
<string name="overflow_event_temperature">🌡️ Température</string>
|
||||
<string name="overflow_event_colic">💨 Colique gazeuse</string>
|
||||
|
||||
<string name="toast_event_added">Entrée ajoutée</string>
|
||||
<string name="toast_logbook_saved">Journal ajouté</string>
|
||||
<string name="toast_event_add_error">Impossible d\'enregistrer cette entrée</string>
|
||||
|
||||
@@ -3,6 +3,13 @@
|
||||
<string name="title">🌜 LunaTracker 🌛</string>
|
||||
<string name="logbook">Diario di bordo</string>
|
||||
|
||||
<string name="overflow_event_weight">⚖️ Peso</string>
|
||||
<string name="overflow_event_medicine">💊 Medicina</string>
|
||||
<string name="overflow_event_enema">🪠 Clistere</string>
|
||||
<string name="overflow_event_note">📝 Nota</string>
|
||||
<string name="overflow_event_temperature">🌡️ Temperatura</string>
|
||||
<string name="overflow_event_colic">💨 Colichette</string>
|
||||
|
||||
<string name="event_bottle_desc">Biberon</string>
|
||||
<string name="event_food_desc">Cibo</string>
|
||||
<string name="event_weight_desc">Pesata</string>
|
||||
|
||||
@@ -6,4 +6,44 @@
|
||||
<item>@string/amount_normal</item>
|
||||
<item>@string/amount_plenty</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsTypeLabels">
|
||||
<item>Bottle</item>
|
||||
<item>Sleep</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsTypeValues">
|
||||
<item>BOTTLE</item>
|
||||
<item>SLEEP</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsDataLabels">
|
||||
<item>Event</item>
|
||||
<item>Amount</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsDataValues">
|
||||
<item>EVENT</item>
|
||||
<item>AMOUNT</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsTimeLabels">
|
||||
<item>Day</item>
|
||||
<item>Week</item>
|
||||
<item>Month</item>
|
||||
</string-array>
|
||||
|
||||
<string-array name="StatisticsTimeValues">
|
||||
<item>DAY</item>
|
||||
<item>WEEK</item>
|
||||
<item>MONTH</item>
|
||||
</string-array>
|
||||
|
||||
<!--
|
||||
<string-array name="speakerphoneModeValues">
|
||||
<item>auto</item>
|
||||
<item>on</item>
|
||||
<item>off</item>
|
||||
</string-array>
|
||||
-->
|
||||
</resources>
|
||||
|
||||
@@ -3,13 +3,12 @@
|
||||
<string name="title">🌜 LunaTracker 🌛</string>
|
||||
<string name="logbook">Logged events</string>
|
||||
|
||||
<!-- menu header items -->
|
||||
<string name="event_bottle_type" translatable="false">🍼</string>
|
||||
<string name="event_food_type" translatable="false">🥣</string>
|
||||
<string name="event_weight_type" translatable="false">⚖️</string>
|
||||
<string name="event_breastfeeding_left_type" translatable="false">🤱⬅️</string>
|
||||
<string name="event_breastfeeding_both_type" translatable="false">🤱↔️</string>
|
||||
<string name="event_breastfeeding_right_type" translatable="false">🤱➡️️</string>
|
||||
<string name="event_breastfeeding_left_type" translatable="false">🤱 ←</string>
|
||||
<string name="event_breastfeeding_both_type" translatable="false">🤱 ↔</string>
|
||||
<string name="event_breastfeeding_right_type" translatable="false">🤱 →</string>
|
||||
<string name="event_diaperchange_poo_type" translatable="false">🚼 💩</string>
|
||||
<string name="event_diaperchange_pee_type" translatable="false">🚼 💧</string>
|
||||
<string name="event_medicine_type" translatable="false">💊</string>
|
||||
@@ -20,36 +19,16 @@
|
||||
<string name="event_puke_type" translatable="false">🤮</string>
|
||||
<string name="event_bath_type" translatable="false">🛁</string>
|
||||
<string name="event_sleep_type" translatable="false">💤</string>
|
||||
<string name="event_unknown_type" translatable="false">❓</string>
|
||||
<string name="event_unknown_type" translatable="false">\?</string>
|
||||
|
||||
<!-- dropdown menu item -->
|
||||
<string name="event_type_item_bottle">🍼 Bottle</string>
|
||||
<string name="event_type_item_food">🥣 Food</string>
|
||||
<string name="event_type_item_weight">⚖️ Weight</string>
|
||||
<string name="event_type_item_breastfeeding_left">🤱⬅️ Nursing</string>
|
||||
<string name="event_type_item_breastfeeding_both">🤱↔️ Nursing</string>
|
||||
<string name="event_type_item_breastfeeding_right">🤱➡️️ Nursing</string>
|
||||
<string name="event_type_item_diaperchange_poo">🚼💩 Diaper</string>
|
||||
<string name="event_type_item_diaperchange_pee">🚼💧 Diaper</string>
|
||||
<string name="event_type_item_medicine">💊 Medicine</string>
|
||||
<string name="event_type_item_enema">🪠 Enema</string>
|
||||
<string name="event_type_item_note">📝 Note</string>
|
||||
<string name="event_type_item_temperature">🌡️ Temperature</string>
|
||||
<string name="event_type_item_colic">💨 Colic</string>
|
||||
<string name="event_type_item_puke">🤮 Puke</string>
|
||||
<string name="event_type_item_sleep">💤 Sleep</string>
|
||||
<string name="event_type_item_bath">🛁 Bath</string>
|
||||
<string name="event_type_item_unknown">❓ Unknown</string>
|
||||
|
||||
<!-- dialog titles -->
|
||||
<string name="event_bottle_desc">Milk Bottle</string>
|
||||
<string name="event_bottle_desc">Baby bottle</string>
|
||||
<string name="event_food_desc">Food</string>
|
||||
<string name="event_weight_desc">Weight</string>
|
||||
<string name="event_breastfeeding_left_desc">Nursing (left)</string>
|
||||
<string name="event_breastfeeding_both_desc">Nursing (both)</string>
|
||||
<string name="event_breastfeeding_right_desc">Nursing (right)</string>
|
||||
<string name="event_diaperchange_poo_desc">Diaper Change (poo)</string>
|
||||
<string name="event_diaperchange_pee_desc">Diaper Change (pee)</string>
|
||||
<string name="event_breastfeeding_left_desc">Breastfeeding (left)</string>
|
||||
<string name="event_breastfeeding_both_desc">Breastfeeding</string>
|
||||
<string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
|
||||
<string name="event_diaperchange_poo_desc">Diaper chg (poo)</string>
|
||||
<string name="event_diaperchange_pee_desc">Diaper chg (pee)</string>
|
||||
<string name="event_medicine_desc">Medicine</string>
|
||||
<string name="event_enema_desc">Enema</string>
|
||||
<string name="event_note_desc">Note</string>
|
||||
@@ -58,7 +37,17 @@
|
||||
<string name="event_puke_desc">Puke</string>
|
||||
<string name="event_bath_desc">Bath</string>
|
||||
<string name="event_sleep_desc">Sleep</string>
|
||||
<string name="event_unknown_desc">Unknown</string>
|
||||
<string name="event_unknown_desc"></string>
|
||||
|
||||
<string name="overflow_event_weight">⚖️ Weight</string>
|
||||
<string name="overflow_event_medicine">💊 Medicine</string>
|
||||
<string name="overflow_event_enema">🪠 Enema</string>
|
||||
<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_sleep">💤 Sleep</string>
|
||||
<string name="overflow_event_bath">🛁 Bath</string>
|
||||
|
||||
<string name="toast_event_added">Event logged</string>
|
||||
<string name="toast_logbook_saved">Logbook saved</string>
|
||||
@@ -88,8 +77,8 @@
|
||||
<string name="no_connection_go_to_settings">Settings</string>
|
||||
<string name="no_connection_retry">Retry</string>
|
||||
|
||||
<string name="settings_dynamic_menu">Dynamic Menu</string>
|
||||
<string name="settings_dynamic_menu_desc">Populate the header menu with the most used events.</string>
|
||||
<string name="statistics_title">Statistics</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>
|
||||
@@ -108,6 +97,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>
|
||||
|
||||
@@ -4,11 +4,6 @@
|
||||
<style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="android:textColor">@color/textColor</item>
|
||||
|
||||
<!-- make the screen not overlap with the system bars -->
|
||||
<item name="android:fitsSystemWindows">true</item>
|
||||
<item name="android:windowTranslucentStatus">true</item>
|
||||
<item name="android:windowTranslucentNavigation">true</item>
|
||||
</style>
|
||||
|
||||
<style name="OverflowMenuText">
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "8.13.0"
|
||||
agp = "8.12.0"
|
||||
kotlin = "2.0.0"
|
||||
coreKtx = "1.10.1"
|
||||
junit = "4.13.2"
|
||||
@@ -9,9 +9,10 @@ lifecycleRuntimeKtx = "2.6.1"
|
||||
activityCompose = "1.8.0"
|
||||
composeBom = "2024.04.01"
|
||||
appcompat = "1.7.0"
|
||||
mpandroidchart = "v4.2.2"
|
||||
mpandroidchartVersion = "v3.1.0"
|
||||
recyclerview = "1.3.2"
|
||||
material = "1.12.0"
|
||||
sardineAndroid = "v0.9"
|
||||
|
||||
[libraries]
|
||||
androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
|
||||
@@ -31,7 +32,8 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
|
||||
androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
|
||||
androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
|
||||
material = { group = "com.google.android.material", name = "material", version.ref = "material" }
|
||||
sardine-android = { module = "com.github.thegrizzlylabs:sardine-android", version.ref = "sardineAndroid" }
|
||||
mpandroidchart = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchart" }
|
||||
mpandroidchart-vv310 = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchartVersion" }
|
||||
|
||||
[plugins]
|
||||
android-application = { id = "com.android.application", version.ref = "agp" }
|
||||
|
||||
Reference in New Issue
Block a user