From 1f5962d361c885dfa22b6ba5eca76d31419042f4 Mon Sep 17 00:00:00 2001 From: rjeevitha33 Date: Thu, 2 Apr 2026 10:05:56 +0200 Subject: [PATCH 1/2] Make flow symptoms more visible by adjusting color #279 --- .../java/com/mensinator/app/business/DatabaseUtils.kt | 6 +++--- .../java/com/mensinator/app/calendar/CalendarScreen.kt | 5 +++-- .../main/java/com/mensinator/app/data/ColorSource.kt | 10 +++++++++- .../com/mensinator/app/symptoms/ManageSymptomScreen.kt | 2 +- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/mensinator/app/business/DatabaseUtils.kt b/app/src/main/java/com/mensinator/app/business/DatabaseUtils.kt index 3b9f1b58..ef8e8484 100644 --- a/app/src/main/java/com/mensinator/app/business/DatabaseUtils.kt +++ b/app/src/main/java/com/mensinator/app/business/DatabaseUtils.kt @@ -155,13 +155,13 @@ object DatabaseUtils { """) // Set all colors for the standard symptoms db.execSQL(""" - UPDATE symptoms SET color = 'DarkRed' where symptom_name = 'Heavy_Flow' + UPDATE symptoms SET color = 'DarkPink' where symptom_name = 'Heavy_Flow' """) db.execSQL(""" - UPDATE symptoms SET color = 'Red' where symptom_name = 'Medium_Flow' + UPDATE symptoms SET color = 'Pink' where symptom_name = 'Medium_Flow' """) db.execSQL(""" - UPDATE symptoms SET color = 'LightRed' where symptom_name = 'Light_Flow' + UPDATE symptoms SET color = 'LightPink' where symptom_name = 'Light_Flow' """) // Fixed symptom colors, so we can remove setting for symptom indicator diff --git a/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt b/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt index 5eea937d..81551fd1 100644 --- a/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt +++ b/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt @@ -414,12 +414,13 @@ fun Day( ) { symptomsForDay.forEach { symptom -> val symptomColor = state.calendarColors.symptomColors[symptom] ?: Color.Red - + var circleBorder = Color.White + if(isDarkMode()) { circleBorder = Color.Black } Box( modifier = Modifier .size(11.dp) .background(symptomColor, CircleShape) - .border(1.dp, Color.LightGray.copy(alpha = 0.25f), CircleShape) + .border(1.dp, circleBorder, CircleShape) ) } } diff --git a/app/src/main/java/com/mensinator/app/data/ColorSource.kt b/app/src/main/java/com/mensinator/app/data/ColorSource.kt index bbbbc60e..5c056f25 100644 --- a/app/src/main/java/com/mensinator/app/data/ColorSource.kt +++ b/app/src/main/java/com/mensinator/app/data/ColorSource.kt @@ -58,6 +58,10 @@ object ColorSource { "Black" to Color(0xFF212121), "DarkGray" to Color(0xFFABABAB), "LightGray" to Color(0xFFDFDDDD), + + "LightPink" to Color(0xFFCC95BB), + "Pink" to Color(0xFFB36098), + "DarkPink" to Color(0xFF7E3366) ) private val darkColorMap = mapOf( @@ -91,6 +95,10 @@ object ColorSource { "White" to Color(0xFFF5F5F5), "DarkGray" to Color(0xFF585858), - "LightGray" to Color(0xFF8F8F8F) + "LightGray" to Color(0xFF8F8F8F), + + "LightPink" to Color(0xFFCC95BB), + "Pink" to Color(0xFFB36098), + "DarkPink" to Color(0xFF7E3366) ) } diff --git a/app/src/main/java/com/mensinator/app/symptoms/ManageSymptomScreen.kt b/app/src/main/java/com/mensinator/app/symptoms/ManageSymptomScreen.kt index 13e44a2a..911b2d97 100644 --- a/app/src/main/java/com/mensinator/app/symptoms/ManageSymptomScreen.kt +++ b/app/src/main/java/com/mensinator/app/symptoms/ManageSymptomScreen.kt @@ -256,7 +256,7 @@ private fun SymptomItemPreview() { MensinatorTheme { SymptomItem( onAction = {}, - symptom = Symptom(1, "Medium flow", 1, "Red"), + symptom = Symptom(1, "Medium flow", 1, "Pink"), showDeletionIcon = true, modifier = Modifier.padding(8.dp) ) From 4e54360743380c27a38562bcae9cf15258fd9b94 Mon Sep 17 00:00:00 2001 From: rjeevitha33 Date: Fri, 10 Apr 2026 15:36:33 +0200 Subject: [PATCH 2/2] #203 Fixing the SymptomsDialog box title 1.Fixed the Symptoms title from "Symptoms for dd/mm/yy" to "Edit Symptoms" 2. Removed the unused variable "date" which is used to fetch the latest date 3. Modified the language translations, where date is appended to the title string. Used deepl for translations. --- .../mensinator/app/calendar/CalendarScreen.kt | 2 -- .../mensinator/app/calendar/SymptomDialogs.kt | 21 ++++++++----------- app/src/main/res/values-ar/strings.xml | 2 +- app/src/main/res/values-bn/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fa/strings.xml | 2 +- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-hi/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-pl/strings.xml | 2 +- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-ta/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 20 files changed, 27 insertions(+), 32 deletions(-) diff --git a/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt b/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt index 81551fd1..aa973544 100644 --- a/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt +++ b/app/src/main/java/com/mensinator/app/calendar/CalendarScreen.kt @@ -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 -> diff --git a/app/src/main/java/com/mensinator/app/calendar/SymptomDialogs.kt b/app/src/main/java/com/mensinator/app/calendar/SymptomDialogs.kt index 46432139..c97f9ff4 100644 --- a/app/src/main/java/com/mensinator/app/calendar/SymptomDialogs.kt +++ b/app/src/main/java/com/mensinator/app/calendar/SymptomDialogs.kt @@ -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, currentlyActiveSymptomIds: PersistentSet, onSave: (PersistentSet) -> Unit, @@ -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())) { @@ -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 = { }, ) @@ -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 = { }, ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index d9fdc969..76c91a80 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -35,7 +35,7 @@ - متوسط طول المرحلة الأصفرية: أيام - الأعراض لـ %1$s + تحرير الأعراض إنشاء عرض جديد حفظ الأعراض إلغاء diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 57aefc45..ad5cb46b 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -69,7 +69,7 @@ দিন - %1$s জন্য উপসর্গ + লক্ষণগুলি সম্পাদনা করুন নতুন উপসর্গ তৈরি করুন উপসর্গ সংরক্ষণ করুন বাতিল করুন diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 0f291001..6d2b25a6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -74,7 +74,7 @@ Durchschn. Länge Lutealphase: Tage - Symptome am %1$s + Symptome bearbeiten Symptom Erstellen Symptome Speichern Abbrechen diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c07a786b..0a9f8986 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -78,7 +78,7 @@ días - Síntomas para %1$s + Editar síntomas Crear nuevo síntoma Guardar síntomas Cancelar diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 3a2d4f7a..a6a3471a 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -55,7 +55,7 @@ تخمک‌گذاری احتمالی بعدی: - روز - علائم برای %1$s + ویرایش علائم ایجاد علامت جدید ذخیره علائم انصراف diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 33443b03..6db8e83c 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -73,7 +73,7 @@ Durée moyenne de la phase lutéale : jours - Symptômes pour %1$s + Modifier les symptômes Créer un nouveau symptôme Enregistrer les symptômes Annuler diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index 53418321..f5768f52 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -70,7 +70,7 @@ दिन - के लिए लक्षण %1$s + लक्षण संपादित करें नया संकेत बनाएँ संकेत सेव करें रद्द diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 5d80761e..55de9bf6 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -74,7 +74,7 @@ Lunghezza media della fase luteale: giorni - Sintomi per %1$s + Modifica sintomi Crea un nuovo sintomo Salva i sintomi Annulla diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index d52a8604..ec44ce25 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -83,7 +83,7 @@ dni - Objawy dla %1$s + Edytuj objawy Utwórz Nowy Objaw Zapisz Objawy Anuluj diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index fc5c5741..b50bde3a 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -62,7 +62,7 @@ - Duração médio da fase lútea: Dias - Sintomas para %1$s + Editar sintomas Criar novo sintoma Salvar sintoma Cancelar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 1a9d4d65..9961d9b8 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -72,7 +72,7 @@ zile - Simptome la data %1$s + Editare simptome Adaugă un simptom nou Salvează simptomele Anulează diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 319ca28a..e240b2f8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -74,7 +74,7 @@ Средняя продолжительность лютеиновой фазы: дней - Симптомы для %1$s + Редактировать симптомы Добавить новый симптом Сохранить симптомы Отмена diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 04ba9d35..7f1eebce 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -79,7 +79,7 @@ dni - Simptomi za %1$s + Uredi simptome Ustvari nov simptom Shrani simptome Prekliči diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index ff939c83..187455ad 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -66,7 +66,7 @@ Medellängd lutealfas: dagar - Symptom for %1$s + Editera symptom Skapa nytt symptom Spara symptom Avbryt diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index b338fb1d..b00ca192 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -71,7 +71,7 @@ " நாட்கள்" - அறிகுறி %1$s + அறிகுறிகளைத் திருத்து புதிய அறிகுறியை உருவாக்கவும் அறிகுறிகளைச் சேமிக்கவும் ரத்து diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 1e84e790..6be6b0fa 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -70,7 +70,7 @@ - Ortalama luteal faz uzunluğu: günler - %1$s Semptomları + Semptomları düzenle Yeni Semptom Oluştur Semptomları Kaydet İptal et diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index da860574..98a9b6b9 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -86,7 +86,7 @@ - 关于%1$s的症状 + 编辑症状 创建新症状 保存症状 取消 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 067eacf4..dabe8d4a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -89,7 +89,7 @@ days - Symptoms for %1$s + Edit Symptoms Create New Symptom Save Symptoms Cancel