feat: 为添加课程页面提供更自由的时间选项

android/app/src/main/kotlin/io/github/benderblog/traintime_pda/model/ClassTableModels.kt

@@ -15,10 +15,10 @@ import java.time.LocalDateTime
 
 object ClassTableConstants {
     const val CLASS_FILE_NAME = "ClassTable.json"
-    const val USER_CLASS_FILE_NAME = "UserClass.json"
     const val EXAM_FILE_NAME = "exam.json"
     const val PHYSICS_EXPERIMENT_FILE_NAME = "PhysicsExperiment.json"
     const val OTHER_EXPERIMENT_FILE_NAME = "OtherExperiment.json"
+    const val CUSTOM_CLASS_FILE_NAME = "CustomClassesV2.json"
 
     // In SharedPreferencesPlugin, SHARED_PREFERENCES_NAME is private.
     // Be attention to the changes of SharedPreferencesPlugin.SHARED_PREFERENCES_NAME.
@@ -80,18 +80,6 @@ data class TimeLineItem(
     }
 }
 
-@Serializable
-data class UserDefinedClassData(
-    val userDefinedDetail: List<ClassDetail>,
-    val timeArrangement: List<TimeArrangement>,
-) {
-    companion object {
-        val EMPTY = UserDefinedClassData(
-            emptyList(), emptyList()
-        )
-    }
-}
-
 @OptIn(ExperimentalSerializationApi::class)
 @Serializable
 @JsonIgnoreUnknownKeys
@@ -100,25 +88,24 @@ data class ClassTableData(
     val semesterCode: String,
     val termStartDay: String,
     val classDetail: List<ClassDetail>,
-    val userDefinedDetail: List<ClassDetail>,
     val timeArrangement: List<TimeArrangement>,
     // ClassChanges has been omitted here since calculated in time main app.
     // NotArrangedClassDetail has been omitted here since useless.
 ) {
     companion object {
         val EMPTY = ClassTableData(
             0, "", "2024-01-01",
-            emptyList(), emptyList(), emptyList(),
+            emptyList(), emptyList(),
         )
     }
 
     // Should never go wrong.
     fun getClassName(arrangement: TimeArrangement): String = when (arrangement.source) {
         Source.SCHOOL -> classDetail[arrangement.index].name
-        Source.USER -> userDefinedDetail[arrangement.index].name
         Source.EXAM -> "Unknown Exam"
         Source.EXPERIMENT -> "Unknown Experiment"
         Source.EMPTY -> "Unknown Empty"
+        Source.USER -> "Unknown Custom Class"
     }
 }
 
@@ -212,3 +199,24 @@ val ExperimentData.timeRanges: List<Pair<LocalDateTime, LocalDateTime>>
         }
     }
 
+@Serializable
+data class CustomClassTimeRange(
+    val id: String,
+    @SerialName("start_time")
+    @Serializable(with = LocalDateTimeSerializer::class)
+    val startTime: LocalDateTime,
+    @SerialName("end_time")
+    @Serializable(with = LocalDateTimeSerializer::class)
+    val endTime: LocalDateTime,
+)
+
+@Serializable
+data class CustomClass(
+    val id: String,
+    val name: String,
+    val teacher: String? = null,
+    val classroom: String? = null,
+    @SerialName("time_ranges")
+    val timeRanges: List<CustomClassTimeRange>,
+)
+

android/app/src/main/kotlin/io/github/benderblog/traintime_pda/widget/classtable/ClassTableDataHolder.kt

@@ -20,10 +20,6 @@ object ClassTableDataHolder {
     var schoolClassJsonData: Result<String> = Result.success("")
         @Synchronized set
 
-    @JvmStatic
-    var userDefinedClassJsonData: Result<String?> = Result.success(null)
-        @Synchronized set
-
     @JvmStatic
     var examJsonData: Result<String> = Result.success("")
         @Synchronized set
@@ -36,6 +32,10 @@ object ClassTableDataHolder {
     var otherExperimentJsonData: Result<String?> = Result.success(null)
         @Synchronized set
 
+    @JvmStatic
+    var customClassJsonData: Result<String?> = Result.success(null)
+        @Synchronized set
+
     @JvmStatic
     var weekSwift: Long = 0
         @Synchronized set
@@ -62,8 +62,8 @@ object ClassTableDataHolder {
                 "Exam JSON loaded, isSuccess: ${examJsonData.isSuccess}, " + "length: ${examJsonData.getOrNull()?.length ?: 0}"
             )
 
-            userDefinedClassJsonData = loadFileContent(
-                context, ClassTableConstants.USER_CLASS_FILE_NAME
+            physicsExperimentJsonData = loadFileContent(
+                context, ClassTableConstants.PHYSICS_EXPERIMENT_FILE_NAME
             ).fold(onSuccess = { Result.success(it) }, onFailure = {
                 if (it is FileNotFoundException) {
                     Result.success(null)
@@ -73,11 +73,11 @@ object ClassTableDataHolder {
             })
             Log.i(
                 TAG,
-                "User Class JSON loaded, isSuccess: ${userDefinedClassJsonData.isSuccess} " + "length: ${userDefinedClassJsonData.getOrNull()?.length ?: 0}"
+                "Physics Experiment JSON loaded, isSuccess: ${physicsExperimentJsonData.isSuccess} " + "length: ${physicsExperimentJsonData.getOrNull()?.length ?: 0}"
             )
 
-            physicsExperimentJsonData = loadFileContent(
-                context, ClassTableConstants.PHYSICS_EXPERIMENT_FILE_NAME
+            otherExperimentJsonData = loadFileContent(
+                context, ClassTableConstants.OTHER_EXPERIMENT_FILE_NAME
             ).fold(onSuccess = { Result.success(it) }, onFailure = {
                 if (it is FileNotFoundException) {
                     Result.success(null)
@@ -87,11 +87,11 @@ object ClassTableDataHolder {
             })
             Log.i(
                 TAG,
-                "Physics Experiment JSON loaded, isSuccess: ${physicsExperimentJsonData.isSuccess} " + "length: ${physicsExperimentJsonData.getOrNull()?.length ?: 0}"
+                "Other Experiment JSON loaded, isSuccess: ${otherExperimentJsonData.isSuccess} " + "length: ${otherExperimentJsonData.getOrNull()?.length ?: 0}"
             )
 
-            otherExperimentJsonData = loadFileContent(
-                context, ClassTableConstants.OTHER_EXPERIMENT_FILE_NAME
+            customClassJsonData = loadFileContent(
+                context, ClassTableConstants.CUSTOM_CLASS_FILE_NAME
             ).fold(onSuccess = { Result.success(it) }, onFailure = {
                 if (it is FileNotFoundException) {
                     Result.success(null)
@@ -101,7 +101,7 @@ object ClassTableDataHolder {
             })
             Log.i(
                 TAG,
-                "Other Experiment JSON loaded, isSuccess: ${otherExperimentJsonData.isSuccess} " + "length: ${otherExperimentJsonData.getOrNull()?.length ?: 0}"
+                "Custom Class JSON loaded, isSuccess: ${customClassJsonData.isSuccess} " + "length: ${customClassJsonData.getOrNull()?.length ?: 0}"
             )
 
             Log.i(TAG, "Finished loading data from files.")

android/app/src/main/kotlin/io/github/benderblog/traintime_pda/widget/classtable/ClassTableWidgetDataProvider.kt

@@ -10,11 +10,11 @@ import io.github.benderblog.traintime_pda.R
 import io.github.benderblog.traintime_pda.model.ClassTableConstants
 import io.github.benderblog.traintime_pda.model.ClassTableData
 import io.github.benderblog.traintime_pda.model.ClassTableWidgetLoadState
+import io.github.benderblog.traintime_pda.model.CustomClass
 import io.github.benderblog.traintime_pda.model.ExamData
 import io.github.benderblog.traintime_pda.model.ExperimentData
 import io.github.benderblog.traintime_pda.model.Source
 import io.github.benderblog.traintime_pda.model.TimeLineItem
-import io.github.benderblog.traintime_pda.model.UserDefinedClassData
 import io.github.benderblog.traintime_pda.model.endTime
 import io.github.benderblog.traintime_pda.model.startTime
 import io.github.benderblog.traintime_pda.model.timeRanges
@@ -34,6 +34,7 @@ class ClassTableWidgetDataProvider {
     private lateinit var classTableData: ClassTableData
     private lateinit var examData: ExamData
     private var experimentData: List<ExperimentData> = emptyList()
+    private var customClassData: List<CustomClass> = emptyList()
 
     private var widgetState = ClassTableWidgetLoadState.LOADING
     private var errorMessage: String? = null
@@ -74,6 +75,7 @@ class ClassTableWidgetDataProvider {
                 loadOneDayClass()
                 loadOneDayExam()
                 loadOneDayExperiment()
+                loadOneDayCustomClass()
                 timeLineItem.sortBy { it.startTime }
             }
         } catch (e: Exception) {
@@ -125,31 +127,6 @@ class ClassTableWidgetDataProvider {
                 "schoolClassTableData loaded, " + "semester code: ${schoolClassTableData.semesterCode}, " + "begin time: ${schoolClassTableData.termStartDay}, " + "semester length: ${schoolClassTableData.semesterLength}, " + "class detail length: ${schoolClassTableData.classDetail.size}, " + "time arrangement length: ${schoolClassTableData.timeArrangement.size}"
             )
 
-            val userDefinedClassData = ClassTableDataHolder.userDefinedClassJsonData.getOrElse {
-                Log.e("$tag[loadBasicConfig]", "Failed to load userDefinedClassJsonData", it)
-                widgetState = ClassTableWidgetLoadState.ERROR_COURSE_USER_DEFINED
-                errorMessage = it.localizedMessage ?: it.message
-                        ?: context.getString(R.string.widget_classtable_unknown_error)
-                return
-            }?.takeIf {
-                Log.i("$tag[loadBasicConfig]", "userDefinedClassJsonData is not blank: ${it.isNotBlank()}")
-                it.isNotBlank()
-            }?.let {
-                try {
-                    lenientJson.decodeFromString<UserDefinedClassData>(it)
-                } catch (e: Exception) {
-                    Log.e("$tag[loadBasicConfig]", "Failed to parse userDefinedClassJsonData", e)
-                    widgetState = ClassTableWidgetLoadState.ERROR_COURSE_USER_DEFINED
-                    errorMessage = e.localizedMessage ?: e.message
-                            ?: context.getString(R.string.widget_classtable_unknown_error)
-                    return
-                }
-            } ?: UserDefinedClassData.EMPTY
-            Log.i(
-                "$tag[loadBasicConfig]",
-                "userDefinedClassJsonData loaded, " + "userDefinedDetail length: ${userDefinedClassData.userDefinedDetail.size}, " + "time arrangement length: ${userDefinedClassData.timeArrangement.size}"
-            )
-
             examData = ClassTableDataHolder.examJsonData.getOrElse {
                 Log.e("$tag[loadBasicConfig]", "Failed to load examJsonData", it)
                 widgetState = ClassTableWidgetLoadState.ERROR_EXAM
@@ -215,17 +192,35 @@ class ClassTableWidgetDataProvider {
 
             experimentData = physicsExperimentData + otherExperimentData
 
-            // merge class table with user added class
-            classTableData = schoolClassTableData.copy(
-                userDefinedDetail = userDefinedClassData.userDefinedDetail,
-                timeArrangement = schoolClassTableData.timeArrangement + userDefinedClassData.timeArrangement,
-            )
-            Log.i("$tag[loadBasicConfig]", "Class table merged.")
+            customClassData = ClassTableDataHolder.customClassJsonData.getOrElse {
+                Log.e("$tag[loadBasicConfig]", "Failed to load customClassJsonData", it)
+                widgetState = ClassTableWidgetLoadState.ERROR_COURSE_USER_DEFINED
+                errorMessage = it.localizedMessage ?: it.message
+                        ?: context.getString(R.string.widget_classtable_unknown_error)
+                return
+            }?.takeIf {
+                Log.i("$tag[loadBasicConfig]", "customClassJsonData is not blank: ${it.isNotBlank()}")
+                it.isNotBlank()
+            }?.let {
+                try {
+                    lenientJson.decodeFromString<List<CustomClass>>(it)
+                } catch (e: Exception) {
+                    Log.e("$tag[loadBasicConfig]", "Failed to parse customClassJsonData", e)
+                    widgetState = ClassTableWidgetLoadState.ERROR_COURSE_USER_DEFINED
+                    errorMessage = e.localizedMessage ?: e.message
+                            ?: context.getString(R.string.widget_classtable_unknown_error)
+                    return
+                }
+            } ?: emptyList()
+            Log.i("$tag[loadBasicConfig]", "customClassData loaded, data length: ${customClassData.size}")
+
+            classTableData = schoolClassTableData
+            Log.i("$tag[loadBasicConfig]", "Class table loaded.")
 
             // calculate day index of today
             val termStartDayStr = classTableData.termStartDay
             if (termStartDayStr.isBlank()) {
-                if (classTableData == ClassTableData.EMPTY && userDefinedClassData == UserDefinedClassData.EMPTY) {
+                if (classTableData == ClassTableData.EMPTY) {
                     Log.w("$tag[loadBasicConfig]", "Term start day is blank and no class data loaded.")
                 } else {
                     Log.e("$tag[loadBasicConfig]", "Term start day is blank, cannot calculate week/day index!")
@@ -396,4 +391,38 @@ class ClassTableWidgetDataProvider {
             }
         }
     }
-}
+
+    private fun loadOneDayCustomClass() {
+        val curYear: Int = currentTime.year
+        val curMonth: Int = currentTime.monthValue
+        val curDay: Int = currentTime.dayOfMonth
+        Log.i(
+            "$tag[loadOneDayCustomClass]",
+            "curTime: $curYear-$curMonth-$curDay",
+        )
+        for ((index, cc) in customClassData.withIndex()) {
+            for (tr in cc.timeRanges) {
+                if (tr.startTime.year == curYear &&
+                    tr.startTime.monthValue == curMonth &&
+                    tr.startTime.dayOfMonth == curDay
+                ) {
+                    Log.i(
+                        "$tag[loadOneDayCustomClass]",
+                        "Adding custom class $cc at date ${tr.startTime}",
+                    )
+                    timeLineItem.add(
+                        TimeLineItem(
+                            type = Source.USER,
+                            name = cc.name,
+                            teacher = cc.teacher ?: "未知教师",
+                            place = cc.classroom ?: "未安排教室",
+                            startTime = tr.startTime,
+                            endTime = tr.endTime,
+                            colorIndex = index,
+                        )
+                    )
+                }
+            }
+        }
+    }
+}

assets/flutter_i18n/en_US.yaml

@@ -70,6 +70,21 @@ weekday:
    saturday: "Sat."
    sunday: "Sun."
 
+# Months
+month:
+   january: "Jan."
+   february: "Feb."
+   march: "Mar."
+   april: "Apr."
+   may: "May"
+   june: "Jun."
+   july: "Jul."
+   august: "Aug."
+   september: "Sept."
+   october: "Oct."
+   november: "Nov."
+   december: "Dec."
+
 # 考勤查询
 class_attendance:
    title: "Attendance Query"
@@ -275,15 +290,28 @@ classtable:
       input_start_time_hint: "Time start"
       input_end_time_hint: "Time end"
       wheel_choose_hint: "Period {index}"
+      choose_at_least_one: "Please choose at least one time for class"
+      repeat_weekly: "Repeat Weekly"
+      free_time: "Free Time"
+      date_selector_free:
+         rule: "Time must be between 8:30 and 21:25."
+         rule_2: "The end time must be later than the start time."
+         class_start_time: "Start time"
+         class_end_time: "End time"
+         edit_class_time: "Edit the class time"
+         choose_class_time: "Choose a class time"
    course_detail_card:
       class_number_string: "Class {number}"
       unknown_teacher: "Unknown teacher"
       unknown_place: "Unknown classroom"
       class_period: "period {start} to {stop}"
       edit: "Edit"
       delete: "Delete"
+      delete_single: "Delete this one"
+      delete_all: "Delete all"
       delete_title: "Are you sure to delete this class information?"
       delete_content: "Everything will be excuted."
+      delete_content_single: "Only the information within this time range of the class will be removed."
    output_to_system:
       success: Successfully output to the system calendar.
       failure: Problem occurred while outputing to the system calendar.