Merge develop - 20240504 (#2503)

* Deleted all files in the main branch in anticipation of merging develop into main cleanly * Merge develop into main
PalisadoesFoundation · May 4, 2024 · be9eaa5 · be9eaa5
1 parent d1c70ff
commit be9eaa5
Show file tree

Hide file tree

Showing 58 changed files with 2,486 additions and 1,625 deletions.
diff --git a/lang/de.json b/lang/de.json
@@ -70,6 +70,8 @@
   "Add Event": "Ereignis hinzufügen",
   "Add": "Anzeige",
   "Add Image": "Bild hinzufügen",
+  "Select Start Date": "Startdatum auswählen",
+  "Select End Date": "Enddatum auswählen",
   "Select Start Date and Time": "Wählen Sie Startdatum und -uhrzeit",
   "Select End Date and Time": "Wählen Sie Enddatum und -uhrzeit",
   "Does not repeat": "Wiederholt sich nicht",

diff --git a/lang/en.json b/lang/en.json
@@ -76,6 +76,8 @@
   "Add Event": "Add Event",
   "Add": "Add",
   "Add Image": "Add Image",
+  "Select Start Date": "Select Start Date",
+  "Select End Date": "Select End Date",
   "Select Start Date and Time": "Select Start Date and Time",
   "Select End Date and Time": "Select End Date and Time",
   "Does not repeat": "Does not repeat",

diff --git a/lang/es.json b/lang/es.json
@@ -73,6 +73,8 @@
   "Add Image": "Añadir imagen",
   "Select Start Date and Time": "Seleccione la fecha y hora de inicio",
   "Select End Date and Time": "Seleccione la fecha y hora de finalización",
+  "Select Start Date": "Seleccionar fecha de inicio",
+  "Select End Date": "Seleccionar fecha de finalización",
   "Does not repeat": "No se repite",
   "Keep Public": "Mantener pública",
   "Keep Registerable": "Mantener registrable",

diff --git a/lang/fr.json b/lang/fr.json
@@ -76,6 +76,8 @@
   "Add Event": "Ajouter un évènement",
   "Add": "Ajoutez-le",
   "Add Image": "Ajouter une image",
+  "Select Start Date": "Sélectionner la date de début",
+  "Select End Date": "Sélectionner la date de fin",
   "Select Start Date and Time": "Sélectionnez la date et l'heure de début",
   "Select End Date and Time": "Sélectionnez la date et l'heure de fin",
   "Does not repeat": "ça ne se répète pas",

diff --git a/lang/hi.json b/lang/hi.json
@@ -71,6 +71,8 @@
   "Add Event": "कार्यक्रम जोड़ें",
   "Add": "इसे जोड़ें",
   "Add Image": "छवि जोड़ें",
+  "Select Start Date": "शुरूआत की तिथि का चयन करें",
+  "Select End Date": "समाप्ति की तिथि का चयन करें",
   "Select Start Date and Time": "प्रारंभ दिनांक और समय चुनें",
   "Select End Date and Time": "समाप्ति तिथि और समय चुनें",
   "Does not repeat": "यह दोहराता नहीं है",

diff --git a/lang/ja.json b/lang/ja.json
@@ -71,6 +71,8 @@
   "Add Event": "イベントを追加",
   "Add": "追加",
   "Add Image": "画像を追加",
+  "Select Start Date": "開始日を選択",
+  "Select End Date": "終了日を選択",
   "Select Start Date and Time": "開始日時を選択します",
   "Select End Date and Time": "終了日時を選択します",
   "Does not repeat": "繰り返さない",

diff --git a/lang/pt.json b/lang/pt.json
@@ -71,6 +71,8 @@
   "Add Event": "Adicionar Evento",
   "Add": "Adicionar",
   "Add Image": "Adicionar imagem",
+  "Select Start Date": "Selecionar data de início",
+  "Select End Date": "Selecionar data de término",
   "Select Start Date and Time": "Selecione a data e hora de início",
   "Select End Date and Time": "Selecione a data e hora de término",
   "Does not repeat": "Não repete",

diff --git a/lang/zh.json b/lang/zh.json
@@ -71,6 +71,8 @@
   "Add Event": "添加事件",
   "Add": "添加",
   "Add Image": "添加图片",
+  "Select Start Date": "选择开始日期",
+  "Select End Date": "选择结束日期",
   "Select Start Date and Time": "选择开始日期和时间",
   "Select End Date and Time": "选择结束日期和时间",
   "Does not repeat": "不重复",

diff --git a/lib/constants/custom_theme.dart b/lib/constants/custom_theme.dart
@@ -1,9 +1,7 @@
-// ignore_for_file: talawa_api_doc
-// ignore_for_file: talawa_good_doc_comments
-
 import 'package:flutter/material.dart';
 
 ///This file contains various custom themes.
+///
 ///For instance, lightTheme, darkTheme, _lightTextTheme, _darkTextTheme, etc.
 ///These are imported to other files/widgets to apply the required themes.
 class TalawaTheme {
@@ -25,6 +23,7 @@ class TalawaTheme {
   static const Color _darkInWhite = Color(0xffffffff);
   static const Color _darkColorSchemePrimary = Color(0xfffabc57);
 
+  /// Theme for light mode.
   static final lightTheme = ThemeData(
     scaffoldBackgroundColor: _lightScaffoldColor,
     textSelectionTheme: const TextSelectionThemeData(
@@ -41,10 +40,14 @@ class TalawaTheme {
       primaryContainer: _lightPrimaryVariantColor,
       primary: _lightColorSchemePrimary,
       secondary: Color(0xffF5F5F5),
+      onSecondary: Colors.black,
       secondaryContainer: _darkScaffoldColor,
+      tertiary: Colors.black26,
+      tertiaryContainer: Color.fromARGB(255, 231, 231, 231),
     ).copyWith(secondary: _lightAccentColor),
   );
 
+  /// Theme for dark mode.
   static final darkTheme = ThemeData(
     textSelectionTheme: const TextSelectionThemeData(
       cursorColor: _darkCursorColor,
@@ -61,7 +64,10 @@ class TalawaTheme {
       primaryContainer: _darkPrimaryVariantColor,
       primary: _darkColorSchemePrimary,
       secondary: Colors.black,
+      onSecondary: Colors.white,
       secondaryContainer: _lightScaffoldColor,
+      tertiary: Colors.white70,
+      tertiaryContainer: Color.fromARGB(255, 61, 61, 61),
     ).copyWith(secondary: _darkAccentColor),
   );
 
@@ -78,12 +84,8 @@ class TalawaTheme {
       fontSize: 16,
       color: Color(0xFF737373),
     ),
-    bodyLarge: TextStyle(
-      fontSize: 14,
-    ),
-    bodyMedium: TextStyle(
-      fontSize: 14,
-    ),
+    bodyLarge: TextStyle(fontSize: 14, color: Color(0xFF737373)),
+    bodyMedium: TextStyle(fontSize: 14),
     bodySmall: TextStyle(
       fontWeight: FontWeight.w400,
       color: Color(0xFF737373),