diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 507666c..424931e 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,8 +12,8 @@ android { applicationId = "it.danieleverducci.lunatracker" minSdk = 21 targetSdk = 34 - versionCode = 2 - versionName = "0.3" + versionCode = 3 + versionName = "0.5" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt index 2918be1..ca7e511 100644 --- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt +++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt @@ -90,7 +90,7 @@ class MainActivity : AppCompatActivity() { // Set listeners findViewById(R.id.logbooks_add_button).setOnClickListener { showAddLogbookDialog(true) } findViewById(R.id.button_bottle).setOnClickListener { askBabyBottleContent() } - findViewById(R.id.button_scale).setOnClickListener { askWeightValue() } + findViewById(R.id.button_food).setOnClickListener { askNotes(LunaEvent(LunaEvent.TYPE_FOOD)) } findViewById(R.id.button_nipple_left).setOnClickListener { logEvent( LunaEvent( LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE @@ -257,12 +257,7 @@ class MainActivity : AppCompatActivity() { val d = AlertDialog.Builder(this) val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null) d.setTitle(lunaEvent.getTypeDescription(this)) - d.setMessage( - when (lunaEvent.type){ - LunaEvent.TYPE_MEDICINE -> R.string.log_medicine_dialog_description - else -> R.string.log_notes_dialog_description - } - ) + d.setMessage(lunaEvent.getDialogMessage(this)) d.setView(dialogView) val notesET = dialogView.findViewById(R.id.notes_edittext) val qtyET = dialogView.findViewById(R.id.notes_qty_edittext) @@ -732,6 +727,10 @@ class MainActivity : AppCompatActivity() { ) dismiss() }) + contentView.findViewById(R.id.button_scale).setOnClickListener({ + askWeightValue() + dismiss() + }) }.also { popupWindow -> popupWindow.setOnDismissListener({ Handler(mainLooper).postDelayed({ diff --git a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt index d62891e..2569ec6 100644 --- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt +++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt @@ -27,6 +27,7 @@ class LunaEvent { val TYPE_CUSTOM = "CUSTOM" val TYPE_COLIC = "COLIC" val TYPE_TEMPERATURE = "TEMPERATURE" + val TYPE_FOOD = "FOOD" } private val jo: JSONObject @@ -88,6 +89,7 @@ class LunaEvent { 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 else -> R.string.event_unknown_type } ) @@ -108,11 +110,19 @@ class LunaEvent { 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 else -> R.string.event_unknown_desc } ) } + fun getDialogMessage(context: Context): String? { + return when(type) { + TYPE_MEDICINE -> context.getString(R.string.log_medicine_dialog_description) + else -> null + } + } + fun toJson(): JSONObject { return jo } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index cbcb678..125caf0 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -108,7 +108,7 @@ android:text="@string/event_bottle_type"/> + android:text="@string/event_food_type"/> diff --git a/app/src/main/res/layout/more_events_popup.xml b/app/src/main/res/layout/more_events_popup.xml index c29ad95..596bc0c 100644 --- a/app/src/main/res/layout/more_events_popup.xml +++ b/app/src/main/res/layout/more_events_popup.xml @@ -59,6 +59,16 @@ style="@style/OverflowMenuText" android:text="@string/overflow_event_colic"/> + + \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dfaf69a..fdc013d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -13,6 +13,7 @@ Temperatura Inserisci la temperatura + ⚖️ Peso 💊 Medicina 🪠 Clistere 📝 Nota @@ -20,6 +21,7 @@ 💨 Colichette Biberon + Cibo Pesata Allatt. al seno (sx) Allatt. al seno diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 68635ad..a874735 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -14,6 +14,7 @@ Insert the temperature 🍼 + 🥣 ⚖️ 🤱 ← 🤱 ↔ @@ -28,6 +29,7 @@ \? Baby bottle + Food Weight Breastfeeding (left) Breastfeeding @@ -41,6 +43,7 @@ Gaseous colic + ⚖️ Weight 💊 Medicine 🪠 Enema 📝 Note diff --git a/fastlane/metadata/android/en-US/changelogs/3.txt b/fastlane/metadata/android/en-US/changelogs/3.txt new file mode 100644 index 0000000..ec38f1e --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/3.txt @@ -0,0 +1,3 @@ +Multiple children support +Fixed interface in devices with big font size +