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
@@ -0,0 +1,34 @@
package com.chukchukhaksa.mobile.preview.component.home

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.chukchukhaksa.mobile.common.designsystem.theme.CchTheme
import com.chukchukhaksa.mobile.common.model.academic.CourseDetail
import com.chukchukhaksa.mobile.presentation.home.component.CchCourseDetailContainer
import com.chukchukhaksa.mobile.presentation.home.component.CchTotalGradeContainer

@Preview
@Composable
fun CchCourseDetailContainerPreview() {
val course = CourseDetail(
areaType = "์ „๊ณต์„ ํƒ",
courseCode = "09643",
courseName = "๋ชจ๋ฐ”์ผํ”„๋กœ๊ทธ๋ž˜๋ฐ",
credits = 3,
grade = "B+",
id = "0",
isOnline = false,
isRetake = false,
isRetakeDelete = true,
originalScore = 40,
professor = "์ •์›์šฉ",
score = 94,
semester = 10,
year = 2023,
)
CchTheme {
CchCourseDetailContainer(
course = course
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
package com.chukchukhaksa.mobile.preview.component.home

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.chukchukhaksa.mobile.common.designsystem.theme.CchTheme
import com.chukchukhaksa.mobile.common.model.graduation.GraduationProcessCourse
import com.chukchukhaksa.mobile.presentation.home.component.CchGraduationProgressContainer
import com.chukchukhaksa.mobile.presentation.home.component.CchGraduationRequirementsContainer

//@Preview(heightDp = 131)
@Preview
@Composable
fun CchGraduationProgressContainerPreview() {
val courses = listOf(
GraduationProcessCourse(
courseName = "ํšŒ๋กœ์ด๋ก ",
credits = 2,
grade = "A+",
semester = 10,
year = 2023,
),
GraduationProcessCourse(
courseName = "ํšŒ๋กœ์ด๋ก ",
credits = 2,
grade = "B+",
semester = 10,
year = 2023,
),
GraduationProcessCourse(
courseName = "ํšŒ๋กœ์ด๋ก ",
credits = 2,
grade = "C+",
semester = 10,
year = 2023,
),
GraduationProcessCourse(
courseName = "ํšŒ๋กœ์ด๋ก ",
credits = 2,
grade = "D+",
semester = 10,
year = 2023,
),
GraduationProcessCourse(
courseName = "ํšŒ๋กœ์ด๋ก ",
credits = 2,
grade = "F",
semester = 10,
year = 2023,
),
)
CchTheme {
CchGraduationProgressContainer(
requirementStatus = true,
areaType = "์ค‘์š”ํ•ต์‹ฌ",
earnedCredits = 5,
requiredCredits = 6,
courses = courses,
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.chukchukhaksa.mobile.preview.component.home

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.chukchukhaksa.mobile.common.designsystem.theme.CchTheme
import com.chukchukhaksa.mobile.presentation.home.component.CchGraduationRequirementsContainer

//@Preview(heightDp = 131)
@Preview
@Composable
fun CchGraduationRequirementsContainerPreview() {
CchTheme {
CchGraduationRequirementsContainer(
major = "์ •๋ณดํ†ต์‹ ํ•™๋ถ€",
gradeLevel = 18,
totalEarnedCredits = 109,
requiredCredits = 130,
onClickGraduationProgress = {},
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.chukchukhaksa.mobile.preview.component.home

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.chukchukhaksa.mobile.common.designsystem.theme.CchTheme
import com.chukchukhaksa.mobile.presentation.home.component.CchGraduationRequirementsContainer
import com.chukchukhaksa.mobile.presentation.home.component.CchSemesterGradeButton

@Preview
@Composable
fun CchSemesterGradeButtonPreview() {
CchTheme {
CchSemesterGradeButton(
startSemester = "1ํ•™๋…„ 1ํ•™๊ธฐ",
endSemester = "3ํ•™๋…„ 1ํ•™๊ธฐ",
onClick = {}
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.chukchukhaksa.mobile.preview.component.home

import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.chukchukhaksa.mobile.common.designsystem.theme.CchTheme
import com.chukchukhaksa.mobile.presentation.home.component.CchTotalGradeContainer

@Preview
@Composable
fun CchTotalGradeContainerPreview() {
CchTheme {
CchTotalGradeContainer(
totalEarnedCredits = 109,
cumulativeGpa = 3.03,
percentile = 83.2,
)
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M10.384,6.75C10.285,6.747 10.187,6.764 10.095,6.799C10.003,6.834 9.918,6.887 9.847,6.955C9.775,7.023 9.718,7.104 9.678,7.193C9.637,7.283 9.615,7.381 9.612,7.479C9.61,7.578 9.626,7.676 9.661,7.768C9.696,7.86 9.749,7.944 9.816,8.016L9.825,8.025L9.835,8.033L14.43,12.003L9.835,15.974L9.827,15.981L9.819,15.988C9.75,16.059 9.696,16.144 9.659,16.236C9.623,16.329 9.605,16.428 9.607,16.527C9.61,16.627 9.632,16.725 9.672,16.815C9.712,16.906 9.771,16.988 9.843,17.057C9.915,17.125 10,17.178 10.093,17.213C10.186,17.248 10.285,17.264 10.384,17.261C10.483,17.257 10.581,17.234 10.671,17.192C10.753,17.154 10.827,17.101 10.891,17.036V17.037L16.028,12.534L16.037,12.526L16.045,12.519C16.177,12.379 16.25,12.195 16.25,12.003C16.25,11.811 16.177,11.627 16.045,11.487L16.037,11.479L16.028,11.471L10.891,6.969L10.89,6.971C10.825,6.907 10.752,6.853 10.669,6.815C10.579,6.775 10.482,6.753 10.384,6.75Z"
android:strokeWidth="0.5"
android:fillColor="#2B2B2B"
android:strokeColor="#2B2B2B"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M17.25,10.384C17.253,10.285 17.236,10.187 17.201,10.095C17.166,10.003 17.113,9.918 17.045,9.847C16.977,9.775 16.896,9.718 16.807,9.678C16.717,9.637 16.619,9.615 16.521,9.612C16.422,9.61 16.324,9.626 16.232,9.661C16.14,9.696 16.056,9.749 15.984,9.816L15.975,9.825L15.967,9.835L11.997,14.43L8.026,9.835L8.02,9.827L8.012,9.819C7.94,9.75 7.856,9.696 7.764,9.659C7.671,9.623 7.572,9.605 7.473,9.607C7.373,9.61 7.275,9.632 7.185,9.672C7.094,9.712 7.012,9.771 6.943,9.843C6.875,9.915 6.822,10 6.787,10.093C6.752,10.186 6.736,10.285 6.739,10.384C6.743,10.483 6.766,10.581 6.808,10.671C6.846,10.753 6.899,10.827 6.964,10.891L6.963,10.891L11.466,16.028L11.474,16.037L11.481,16.045C11.621,16.177 11.805,16.25 11.997,16.25C12.189,16.25 12.373,16.177 12.513,16.045L12.521,16.037L12.529,16.028L17.031,10.891L17.029,10.89C17.093,10.825 17.147,10.752 17.185,10.669C17.225,10.579 17.247,10.482 17.25,10.384Z"
android:strokeWidth="0.5"
android:fillColor="#2B2B2B"
android:strokeColor="#2B2B2B"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M17.25,10.384C17.253,10.285 17.236,10.187 17.201,10.095C17.166,10.003 17.113,9.918 17.045,9.847C16.977,9.775 16.896,9.718 16.807,9.678C16.717,9.637 16.619,9.615 16.521,9.612C16.422,9.61 16.324,9.626 16.232,9.661C16.14,9.696 16.056,9.749 15.984,9.816L15.975,9.825L15.967,9.835L11.997,14.43L8.026,9.835L8.02,9.827L8.012,9.819C7.94,9.75 7.856,9.696 7.764,9.659C7.671,9.623 7.572,9.605 7.473,9.607C7.373,9.61 7.275,9.632 7.185,9.672C7.094,9.712 7.012,9.771 6.943,9.843C6.875,9.915 6.822,10 6.787,10.093C6.752,10.186 6.736,10.285 6.739,10.384C6.743,10.483 6.766,10.581 6.808,10.671C6.846,10.753 6.899,10.827 6.964,10.891L6.963,10.891L11.466,16.028L11.474,16.037L11.481,16.045C11.621,16.177 11.805,16.25 11.997,16.25C12.189,16.25 12.373,16.177 12.513,16.045L12.521,16.037L12.529,16.028L17.031,10.891L17.029,10.89C17.093,10.825 17.147,10.752 17.185,10.669C17.225,10.579 17.247,10.482 17.25,10.384Z"
android:strokeWidth="0.5"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M6.75,13.616C6.747,13.715 6.764,13.813 6.799,13.905C6.834,13.997 6.887,14.082 6.955,14.153C7.023,14.225 7.104,14.282 7.193,14.322C7.283,14.363 7.381,14.385 7.479,14.388C7.578,14.39 7.676,14.374 7.768,14.339C7.86,14.304 7.944,14.251 8.016,14.184L8.025,14.175L8.033,14.165L12.003,9.57L15.974,14.165L15.981,14.173L15.988,14.181C16.059,14.25 16.144,14.304 16.236,14.341C16.329,14.377 16.428,14.395 16.527,14.393C16.627,14.39 16.725,14.368 16.815,14.328C16.906,14.288 16.988,14.229 17.057,14.157C17.125,14.085 17.178,14 17.213,13.907C17.248,13.814 17.264,13.715 17.261,13.616C17.257,13.517 17.234,13.419 17.192,13.329C17.154,13.247 17.101,13.173 17.036,13.109L17.037,13.109L12.534,7.972L12.526,7.963L12.519,7.955C12.379,7.823 12.195,7.75 12.003,7.75C11.811,7.75 11.627,7.823 11.487,7.955L11.479,7.963L11.471,7.972L6.969,13.109L6.971,13.11C6.907,13.175 6.853,13.248 6.815,13.331C6.775,13.421 6.753,13.518 6.75,13.616Z"
android:strokeWidth="0.5"
android:fillColor="#2B2B2B"
android:strokeColor="#2B2B2B"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M6.75,13.616C6.747,13.715 6.764,13.813 6.799,13.905C6.834,13.997 6.887,14.082 6.955,14.153C7.023,14.225 7.104,14.282 7.193,14.322C7.283,14.363 7.381,14.385 7.479,14.388C7.578,14.39 7.676,14.374 7.768,14.339C7.86,14.304 7.944,14.251 8.016,14.184L8.025,14.175L8.033,14.165L12.003,9.57L15.974,14.165L15.981,14.173L15.988,14.181C16.059,14.25 16.144,14.304 16.236,14.341C16.329,14.377 16.428,14.395 16.527,14.393C16.627,14.39 16.725,14.368 16.815,14.328C16.906,14.288 16.988,14.229 17.057,14.157C17.125,14.085 17.178,14 17.213,13.907C17.248,13.814 17.264,13.715 17.261,13.616C17.257,13.517 17.234,13.419 17.192,13.329C17.154,13.247 17.101,13.173 17.036,13.109L17.037,13.109L12.534,7.972L12.526,7.963L12.519,7.955C12.379,7.823 12.195,7.75 12.003,7.75C11.811,7.75 11.627,7.823 11.487,7.955L11.479,7.963L11.471,7.972L6.969,13.109L6.971,13.11C6.907,13.175 6.853,13.248 6.815,13.331C6.775,13.421 6.753,13.518 6.75,13.616Z"
android:strokeWidth="0.5"
android:fillColor="#ffffff"
android:strokeColor="#ffffff"/>
</vector>
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="18dp"
android:height="18dp"
android:viewportWidth="18"
android:viewportHeight="18">
<group>
<clip-path
android:pathData="M0.75,0.75h16.455v16.455h-16.455z"/>
<path
android:pathData="M15.182,0.75H2.773C1.656,0.75 0.75,1.656 0.75,2.773V15.182C0.75,16.299 1.656,17.205 2.773,17.205H15.182C16.299,17.205 17.205,16.299 17.205,15.182V2.773C17.205,1.656 16.299,0.75 15.182,0.75Z"
android:fillColor="#7F71FB"/>
<path
android:pathData="M5.25,7.865L8.228,13.022"
android:strokeLineJoin="round"
android:strokeWidth="1.6488"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
<path
android:pathData="M12.894,6.031L8.228,13.022"
android:strokeLineJoin="round"
android:strokeWidth="1.6488"
android:fillColor="#00000000"
android:strokeColor="#ffffff"
android:strokeLineCap="round"/>
</group>
</vector>
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ data class AcademicRecord(
)

data class AcademicRecordCourses(
val liberal: List<Liberal>,
val major: List<Major>
val liberal: List<CourseDetail>,
val major: List<CourseDetail>
)

data class SemesterGrade(
Expand All @@ -21,24 +21,7 @@ data class SemesterGrade(
val year: Int
)

data class Major(
val areaType: String,
val courseCode: String,
val courseName: String,
val credits: Int,
val grade: String,
val id: String,
val isOnline: Boolean,
val isRetake: Boolean,
val isRetakeDelete: Boolean,
val originalScore: Int,
val professor: String,
val score: Int,
val semester: Int,
val year: Int
)

data class Liberal(
data class CourseDetail(
val areaType: String,
val courseCode: String,
val courseName: String,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ package com.chukchukhaksa.mobile.common.model.response.academic

import com.chukchukhaksa.mobile.common.model.academic.AcademicRecord
import com.chukchukhaksa.mobile.common.model.academic.AcademicRecordCourses
import com.chukchukhaksa.mobile.common.model.academic.Liberal
import com.chukchukhaksa.mobile.common.model.academic.Major
import com.chukchukhaksa.mobile.common.model.academic.CourseDetail
import com.chukchukhaksa.mobile.common.model.academic.SemesterGrade

data class AcademicRecordResponse(
Expand Down Expand Up @@ -71,7 +70,7 @@ data class MajorData(
val semester: Int,
val year: Int
) {
fun toMajor() = Major(
fun toMajor() = CourseDetail(
areaType = areaType,
courseCode = courseCode,
courseName = courseName,
Expand Down Expand Up @@ -105,7 +104,7 @@ data class LiberalData(
val semester: Int,
val year: Int
) {
fun toLiberal() = Liberal(
fun toLiberal() = CourseDetail(
areaType = areaType,
courseCode = courseCode,
courseName = courseName,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.chukchukhaksa.mobile.common.ui

import androidx.compose.ui.graphics.Color
import com.chukchukhaksa.mobile.common.designsystem.theme.Black100
import com.chukchukhaksa.mobile.common.designsystem.theme.Gray500
import com.chukchukhaksa.mobile.common.designsystem.theme.Green200
import com.chukchukhaksa.mobile.common.designsystem.theme.Purple600
import com.chukchukhaksa.mobile.common.designsystem.theme.Red400
import com.chukchukhaksa.mobile.common.designsystem.theme.Yellow200

fun String.gradeColor(): Color {
return when(this) {
"A+", "A0" -> return Red400
"B+", "B0" -> return Yellow200
"C+", "C0" -> return Green200
"D+", "D0", "F" -> return Gray500
"P" -> return Purple600
else -> Black100
}
}
Loading
Loading