Feature/#92 open lecture list

core/database/src/main/java/com/suwiki/core/database/di/DaoModule.kt

@@ -1,9 +1,7 @@
 package com.suwiki.core.database.di
 
-import com.suwiki.core.database.dao.OpenLectureDao
 import com.suwiki.core.database.dao.OpenMajorDao
 import com.suwiki.core.database.dao.TimeTableDao
-import com.suwiki.core.database.database.OpenLectureDatabase
 import com.suwiki.core.database.database.OpenMajorDatabase
 import com.suwiki.core.database.database.TimetableDatabase
 import dagger.Module
@@ -18,9 +16,6 @@ object DaoModule {
   @Provides
   fun provideOpenMajorDao(db: OpenMajorDatabase): OpenMajorDao = db.openMajorDao()
 
-  @Provides
-  fun provideOpenLectureDao(db: OpenLectureDatabase): OpenLectureDao = db.openLectureDao()
-
   @Provides
   fun provideTimetableDao(db: TimetableDatabase): TimeTableDao = db.timetableDao()
 }

core/database/src/main/java/com/suwiki/core/database/di/DatabaseModule.kt

@@ -2,7 +2,6 @@ package com.suwiki.core.database.di
 
 import android.content.Context
 import androidx.room.Room
-import com.suwiki.core.database.database.OpenLectureDatabase
 import com.suwiki.core.database.database.OpenMajorDatabase
 import com.suwiki.core.database.database.TimetableDatabase
 import com.suwiki.core.database.database.migration.TIMETABLE_MIGRATION_1_2
@@ -32,21 +31,6 @@ object DatabaseModule {
       .build()
   }
 
-  @Singleton
-  @Provides
-  fun provideOpenLectureDatabase(
-    @ApplicationContext context: Context,
-  ): OpenLectureDatabase {
-    return Room
-      .databaseBuilder(
-        context,
-        OpenLectureDatabase::class.java,
-        DatabaseName.OPEN_LECTURE,
-      )
-      .fallbackToDestructiveMigration()
-      .build()
-  }
-
   @Singleton
   @Provides
   fun provideTimetableDatabase(
@@ -64,11 +48,7 @@ object DatabaseModule {
   }
 }
 
-/**
- * 상수 이름과 실제 값이 일치하지 않는 이유는 이전 버전과의 호환을 위해 레거시 데이터베이스의 이름을 변경할 수 없었기 때문입니다.
- */
 object DatabaseName {
   const val OPEN_MAJOR = "open-major-database"
-  const val OPEN_LECTURE = "timetable-database"
   const val TIMETABLE = "timetable-list-database"
 }

core/designsystem/src/main/java/com/suwiki/core/designsystem/component/button/SuwikiContainedButton.kt

@@ -79,7 +79,7 @@ fun SuwikiContainedSmallButton(
     backgroundColor = GrayF6,
     rippleColor = Black,
     textColor = Gray95,
-    textStyle = SuwikiTheme.typography.caption6,
+    textStyle = SuwikiTheme.typography.caption2,
     padding = PaddingValues(horizontal = 6.dp, vertical = 2.5.dp),
   )
 }

core/designsystem/src/main/java/com/suwiki/core/designsystem/component/card/SuwikiClassInformationCard.kt

@@ -15,14 +15,18 @@ import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.suwiki.core.designsystem.R
 import com.suwiki.core.designsystem.component.button.SuwikiContainedSmallButton
 import com.suwiki.core.designsystem.theme.Black
 import com.suwiki.core.designsystem.theme.Gray6A
 import com.suwiki.core.designsystem.theme.GrayDA
+import com.suwiki.core.designsystem.theme.GrayF6
 import com.suwiki.core.designsystem.theme.SuwikiTheme
 import com.suwiki.core.designsystem.theme.White
 import com.suwiki.core.ui.extension.suwikiClickable
@@ -32,9 +36,7 @@ fun SuwikiClassInformationCard(
   modifier: Modifier = Modifier,
   className: String,
   professor: String,
-  day: String,
-  classPeriod: String,
-  location: String,
+  cellInfo: String,
   grade: String,
   classType: String,
   openMajor: String,
@@ -45,14 +47,24 @@ fun SuwikiClassInformationCard(
     modifier = modifier
       .fillMaxWidth()
       .background(White)
-      .padding(horizontal = 24.dp, vertical = 16.dp)
+      .drawBehind {
+        val strokeWidth = 1.dp.toPx()
+        drawLine(
+          color = GrayF6,
+          start = Offset(0f, size.height - strokeWidth),
+          end = Offset(size.width, size.height - strokeWidth),
+          strokeWidth = strokeWidth,
+        )
+      }
       .suwikiClickable(
         onClick = onClick,
-      ),
+      )
+      .padding(horizontal = 24.dp, vertical = 16.dp),
     verticalAlignment = Alignment.CenterVertically,
     horizontalArrangement = Arrangement.SpaceBetween,
   ) {
     Column(
+      modifier = Modifier.weight(1f),
       verticalArrangement = Arrangement.spacedBy(2.dp),
     ) {
       Row(
@@ -62,6 +74,9 @@ fun SuwikiClassInformationCard(
         horizontalArrangement = Arrangement.spacedBy(6.dp),
       ) {
         Text(
+          modifier = Modifier.weight(1f, fill = false),
+          maxLines = 1,
+          overflow = TextOverflow.Ellipsis,
           text = className,
           style = SuwikiTheme.typography.body6,
           color = Black,
@@ -74,32 +89,19 @@ fun SuwikiClassInformationCard(
             .padding(vertical = 3.dp),
         )
         Text(
+          maxLines = 1,
           text = professor,
+          overflow = TextOverflow.Ellipsis,
           style = SuwikiTheme.typography.body6,
           color = Black,
         )
       }
 
-      Row(
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.spacedBy(2.dp),
-      ) {
-        Text(
-          text = day,
-          style = SuwikiTheme.typography.caption4,
-          color = Gray6A,
-        )
-        Text(
-          text = classPeriod,
-          style = SuwikiTheme.typography.caption4,
-          color = Gray6A,
-        )
-        Text(
-          text = location,
-          style = SuwikiTheme.typography.caption4,
-          color = Gray6A,
-        )
-      }
+      Text(
+        text = cellInfo,
+        style = SuwikiTheme.typography.caption4,
+        color = Gray6A,
+      )
 
       Row(
         verticalAlignment = Alignment.CenterVertically,
@@ -116,6 +118,7 @@ fun SuwikiClassInformationCard(
           color = Gray6A,
         )
         Text(
+          maxLines = 1,
           text = openMajor,
           style = SuwikiTheme.typography.caption4,
           color = Gray6A,
@@ -125,6 +128,10 @@ fun SuwikiClassInformationCard(
 
     SuwikiContainedSmallButton(text = stringResource(R.string.word_add), onClick = onClickAdd)
   }
+//    HorizontalDivider(
+//      thickness = 1.dp,
+//      color = GrayF6,
+//    )
 }
 
 @Preview
@@ -134,14 +141,12 @@ fun ClassInformationPreview() {
     Column {
       SuwikiClassInformationCard(
         modifier = Modifier,
-        className = "강의명",
-        professor = "교수명",
-        day = "요일",
-        classPeriod = "교시",
-        location = "강의실",
+        className = "강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명 강의명",
+        professor = "교수명 교수명 교수명 교수명 교수명",
+        cellInfo = "목 6,7교시 (미래211) 목 6,7교시 (미래211) 목 6,7교시 (미래211) 목 6,7교시 (미래211)",
         grade = "학년",
         classType = "강의유형",
-        openMajor = "개설학과",
+        openMajor = "개설학과 개설학과 개설학과 개설학과 개설학과 개설학과",
         onClick = {},
         onClickAdd = {},
       )

core/designsystem/src/main/java/com/suwiki/core/designsystem/component/searchbar/SuwikiSearchBar.kt

@@ -43,7 +43,7 @@ fun SuwikiSearchBar(
   Box(
     modifier
       .background(White)
-      .padding(vertical = 10.dp, horizontal = 24.dp)
+      .padding(horizontal = 24.dp)
       .height(40.dp),
     contentAlignment = Alignment.Center,
   ) {

core/designsystem/src/main/res/values/strings.xml

@@ -1,12 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="word_mon">월</string>
-  <string name="word_tue">화</string>
-  <string name="word_wed">수</string>
-  <string name="word_thu">목</string>
-  <string name="word_fri">금</string>
-  <string name="word_sat">토</string>
-  <string name="word_elearning">이러닝</string>
   <string name="honey_quality">꿀강지수</string>
   <string name="learning_quality">배움지수</string>
   <string name="satisfaction_quality">만족지수</string>
@@ -17,11 +10,11 @@
   <string name="word_report">신고</string>
   <string name="word_type_exam">시험유형</string>
   <string name="word_difficulcy">난이도</string>
-    <string name="word_add">추가</string>
-    <string name="word_grade">학점</string>
+  <string name="word_add">추가</string>
+  <string name="word_grade">학점</string>
   <string name="word_homework">과제</string>
   <string name="word_team">팀플</string>
-    <string name="bottom_sheet_agreement_title">서비스 이용을 위해\n약관에 동의해주세요.</string>
+  <string name="bottom_sheet_agreement_title">서비스 이용을 위해\n약관에 동의해주세요.</string>
   <string name="agreement_container_term">(필수) SUWIKI 이용약관</string>
   <string name="agreement_container_personal_policy">(필수) 개인정보처리방침</string>
   <string name="bottom_sheet_agreement_button">동의하고 시작하기</string>

core/model/src/main/java/com/suwiki/core/model/timetable/OpenLecture.kt

@@ -1,14 +1,28 @@
 package com.suwiki.core.model.timetable
 
+import androidx.compose.runtime.Stable
+
+@Stable
+data class OpenLectureData(
+  val isLast: Boolean,
+  val content: List<OpenLecture>,
+)
+
+@Stable
 data class OpenLecture(
-  val number: Long = 0, // 번호
-  val major: String = "", // 개설학과
-  val grade: String = "", // 개설학년
-  val classNumber: String = "", // 교과목번호
-  val classDivideNumber: String = "", // 분반
-  val className: String = "", // 과목명
-  val classification: String = "", // 이수 구분
-  val professor: String = "",
-  val time: String = "",
-  val credit: String = "",
+  val id: Long,
+  val name: String,
+  val type: String,
+  val major: String,
+  val grade: Int,
+  val professorName: String,
+  val originalCellList: List<Cell>,
+)
+
+@Stable
+data class Cell(
+  val location: String,
+  val day: TimetableDay,
+  val startPeriod: Int,
+  val endPeriod: Int,
 )

core/network/build.gradle.kts

@@ -32,9 +32,5 @@ dependencies {
   implementation(libs.okhttp.logging)
   androidTestImplementation(libs.junit4)
 
-  val bom = libs.firebase.bom
-  add("implementation", platform(bom))
-  implementation(libs.bundles.firebase)
-
   implementation(libs.timber)
 }