Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,8 @@ fun CalendarScreen(
// Show the SymptomsDialog
if (showSymptomsDialog.value && state.value.selectedDays.isNotEmpty()) {
val activeSymptoms = state.value.activeSymptoms
val date = state.value.selectedDays.last()

EditSymptomsForDaysDialog(
date = date, // Pass the last selected date
symptoms = activeSymptoms,
currentlyActiveSymptomIds = state.value.activeSymptomIdsForLatestSelectedDay,
onSave = { selectedSymptoms ->
Expand Down
21 changes: 9 additions & 12 deletions app/src/main/java/com/mensinator/app/calendar/SymptomDialogs.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@ import com.mensinator.app.ui.theme.MensinatorTheme
import kotlinx.collections.immutable.PersistentSet
import kotlinx.collections.immutable.persistentSetOf
import kotlinx.collections.immutable.toPersistentSet
import java.time.LocalDate

@Composable
fun EditSymptomsForDaysDialog(
date: LocalDate,
symptoms: PersistentSet<Symptom>,
currentlyActiveSymptomIds: PersistentSet<Int>,
onSave: (PersistentSet<Symptom>) -> Unit,
Expand Down Expand Up @@ -62,7 +59,7 @@ fun EditSymptomsForDaysDialog(
}
},
title = {
Text(text = stringResource(id = R.string.symptoms_dialog_title, date))
Text(text = stringResource(id = R.string.symptoms_dialog_title))
},
text = {
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
Expand Down Expand Up @@ -100,14 +97,14 @@ fun EditSymptomsForDaysDialog(
@Composable
private fun EditSymptomsForDaysDialog_OneDayPreview() {
val symptoms = persistentSetOf(
Symptom(1, "Light", 0, ""),
Symptom(2, "Medium", 1, ""),
Symptom(1, "Heavy Flow", 0, ""),
Symptom(2, "Light Flow", 1, ""),
Symptom(3, "Medium Flow", 2, ""),
)
MensinatorTheme {
EditSymptomsForDaysDialog(
date = LocalDate.now(),
symptoms = symptoms,
currentlyActiveSymptomIds = persistentSetOf(2),
currentlyActiveSymptomIds = persistentSetOf(3),
onSave = {},
onCancel = { },
)
Expand All @@ -119,14 +116,14 @@ private fun EditSymptomsForDaysDialog_OneDayPreview() {
@Composable
private fun EditSymptomsForDaysDialog_MultipleDaysPreview() {
val symptoms = persistentSetOf(
Symptom(1, "Light", 0, ""),
Symptom(2, "Medium", 1, ""),
Symptom(1, "Heavy Flow", 0, ""),
Symptom(2, "Light Flow", 1, ""),
Symptom(3, "Medium Flow", 2, ""),
)
MensinatorTheme {
EditSymptomsForDaysDialog(
date = LocalDate.now(),
symptoms = symptoms,
currentlyActiveSymptomIds = persistentSetOf(2),
currentlyActiveSymptomIds = persistentSetOf(3),
onSave = {},
onCancel = { },
)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<string name="next_predicted_ovulation_default">-</string>
<string name="average_luteal_length">متوسط طول المرحلة الأصفرية:</string>
<string name="days">أيام</string>
<string name="symptoms_dialog_title">الأعراض لـ %1$s</string>
<string name="symptoms_dialog_title">تحرير الأعراض</string>
<string name="create_new_symptom_button">إنشاء عرض جديد</string>
<string name="save_symptoms_button">حفظ الأعراض</string>
<string name="cancel_button">إلغاء</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<string name="days"> দিন</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">%1$s জন্য উপসর্গ</string>
<string name="symptoms_dialog_title">লক্ষণগুলি সম্পাদনা করুন</string>
<string name="create_new_symptom_button">নতুন উপসর্গ তৈরি করুন</string>
<string name="save_symptoms_button">উপসর্গ সংরক্ষণ করুন</string>
<string name="cancel_button">বাতিল করুন</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string name="average_luteal_length">Durchschn. Länge Lutealphase: </string>
<string name="days"> Tage</string>
<!-- Symptoms -->
<string name="symptoms_dialog_title">Symptome am %1$s</string>
<string name="symptoms_dialog_title">Symptome bearbeiten</string>
<string name="create_new_symptom_button">Symptom Erstellen</string>
<string name="save_symptoms_button">Symptome Speichern</string>
<string name="cancel_button">Abbrechen</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<string name="days"> días </string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">Síntomas para %1$s</string>
<string name="symptoms_dialog_title">Editar síntomas</string>
<string name="create_new_symptom_button">Crear nuevo síntoma</string>
<string name="save_symptoms_button">Guardar síntomas</string>
<string name="cancel_button">Cancelar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<string name="next_predicted_ovulation">تخمک‌گذاری احتمالی بعدی:</string>
<string name="next_predicted_ovulation_default">-</string>
<string name="days">روز</string>
<string name="symptoms_dialog_title">علائم برای %1$s</string>
<string name="symptoms_dialog_title">ویرایش علائم</string>
<string name="create_new_symptom_button">ایجاد علامت جدید</string>
<string name="save_symptoms_button">ذخیره علائم</string>
<string name="cancel_button">انصراف</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<string name="average_luteal_length">Durée moyenne de la phase lutéale :</string>
<string name="days">jours</string>
<!-- Symptoms -->
<string name="symptoms_dialog_title">Symptômes pour %1$s</string>
<string name="symptoms_dialog_title">Modifier les symptômes</string>
<string name="create_new_symptom_button">Créer un nouveau symptôme</string>
<string name="save_symptoms_button">Enregistrer les symptômes</string>
<string name="cancel_button">Annuler</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<string name="days"> दिन</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">के लिए लक्षण %1$s</string>
<string name="symptoms_dialog_title">लक्षण संपादित करें</string>
<string name="create_new_symptom_button">नया संकेत बनाएँ</string>
<string name="save_symptoms_button">संकेत सेव करें</string>
<string name="cancel_button">रद्द</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string name="average_luteal_length">Lunghezza media della fase luteale: </string>
<string name="days"> giorni</string>
<!-- Symptoms -->
<string name="symptoms_dialog_title">Sintomi per %1$s</string>
<string name="symptoms_dialog_title">Modifica sintomi</string>
<string name="create_new_symptom_button">Crea un nuovo sintomo</string>
<string name="save_symptoms_button">Salva i sintomi</string>
<string name="cancel_button">Annulla</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<string name="days"> dni</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">Objawy dla %1$s</string>
<string name="symptoms_dialog_title">Edytuj objawy</string>
<string name="create_new_symptom_button">Utwórz Nowy Objaw</string>
<string name="save_symptoms_button">Zapisz Objawy</string>
<string name="cancel_button">Anuluj</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pt-rBR/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
<string name="next_predicted_ovulation_default">-</string>
<string name="average_luteal_length">Duração médio da fase lútea:</string>
<string name="days">Dias</string>
<string name="symptoms_dialog_title">Sintomas para %1$s</string>
<string name="symptoms_dialog_title">Editar sintomas</string>
<string name="create_new_symptom_button">Criar novo sintoma</string>
<string name="save_symptoms_button">Salvar sintoma</string>
<string name="cancel_button">Cancelar</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ro/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<string name="days"> zile</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">Simptome la data %1$s</string>
<string name="symptoms_dialog_title">Editare simptome</string>
<string name="create_new_symptom_button">Adaugă un simptom nou</string>
<string name="save_symptoms_button">Salvează simptomele</string>
<string name="cancel_button">Anulează</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
<string name="average_luteal_length">Средняя продолжительность лютеиновой фазы: </string>
<string name="days">дней</string>
<!-- Symptoms -->
<string name="symptoms_dialog_title">Симптомы для %1$s</string>
<string name="symptoms_dialog_title">Редактировать симптомы</string>
<string name="create_new_symptom_button">Добавить новый симптом</string>
<string name="save_symptoms_button">Сохранить симптомы</string>
<string name="cancel_button">Отмена</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-sl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<string name="days"> dni</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">Simptomi za %1$s</string>
<string name="symptoms_dialog_title">Uredi simptome</string>
<string name="create_new_symptom_button">Ustvari nov simptom</string>
<string name="save_symptoms_button">Shrani simptome</string>
<string name="cancel_button">Prekliči</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-sv/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<string name="average_luteal_length">Medellängd lutealfas:</string>
<!-- Symptoms -->
<string name="days">dagar</string>
<string name="symptoms_dialog_title">Symptom for %1$s</string>
<string name="symptoms_dialog_title">Editera symptom</string>
<string name="create_new_symptom_button">Skapa nytt symptom</string>
<string name="save_symptoms_button">Spara symptom</string>
<string name="cancel_button">Avbryt</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ta/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<string name="days">" நாட்கள்"</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">அறிகுறி %1$s</string>
<string name="symptoms_dialog_title">அறிகுறிகளைத் திருத்து</string>
<string name="create_new_symptom_button">புதிய அறிகுறியை உருவாக்கவும்</string>
<string name="save_symptoms_button">அறிகுறிகளைச் சேமிக்கவும்</string>
<string name="cancel_button">ரத்து</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<string name="next_predicted_ovulation_default">-</string>
<string name="average_luteal_length">Ortalama luteal faz uzunluğu:</string>
<string name="days">günler</string>
<string name="symptoms_dialog_title">%1$s Semptomları</string>
<string name="symptoms_dialog_title">Semptomları düzenle</string>
<string name="create_new_symptom_button">Yeni Semptom Oluştur</string>
<string name="save_symptoms_button">Semptomları Kaydet</string>
<string name="cancel_button">İptal et</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh-rCN/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
<string name="days"> 天</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">关于%1$s的症状</string>
<string name="symptoms_dialog_title">编辑症状</string>
<string name="create_new_symptom_button">创建新症状</string>
<string name="save_symptoms_button">保存症状</string>
<string name="cancel_button">取消</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
<string name="days"> days</string>

<!-- Symptoms -->
<string name="symptoms_dialog_title">Symptoms for %1$s</string>
<string name="symptoms_dialog_title">Edit Symptoms</string>
<string name="create_new_symptom_button">Create New Symptom</string>
<string name="save_symptoms_button">Save Symptoms</string>
<string name="cancel_button">Cancel</string>
Expand Down
Loading