Skip to content

[Feat] 하루요약 상세화면 / 그림자 적용 #15 #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
librawish808 wants to merge 9 commits into
base: develop
Choose a base branch
from
Open

[Feat] 하루요약 상세화면 / 그림자 적용 #15 #24

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d876cd
Feat: 아이콘 추가 #15
librawish808 Mar 18, 2026
034eab4
Chore: 아이콘 및 의존성 추가(프리뷰) #15
librawish808 Mar 24, 2026
6499224
Feat: 오디오 플레이어 화면 구현 #15
librawish808 Mar 24, 2026
5c45739
Fix: 폰트 스타일 변경 가능하도록 수정 #15
librawish808 Mar 24, 2026
bcb26cf
Feat: 하루요약 상세화면 UI구현 #15
librawish808 Mar 24, 2026
4fdf62a
Fix: shadow 반영안되는 사항 수정 #15
librawish808 Mar 24, 2026
a658382
Merge remote-tracking branch 'origin/develop' into feature/screen-det…
librawish808 Mar 24, 2026
2e06480
Chore: Effect.kt가 적용되도록 주석처리 #15
librawish808 Mar 24, 2026
3cfaf3c
Chore: 별도 구현한 shadow 제거 #15
librawish808 Mar 24, 2026
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
4 changes: 4 additions & 0 deletions composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ kotlin {
implementation(compose.material3)
implementation(compose.ui)
implementation(compose.components.resources)
implementation("org.jetbrains.compose.ui:ui-tooling-preview:1.10.1")
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🔴 Critical

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# 목적:
# commonMain 에 Android 전용 Preview import가 남아있는지 확인

echo "[1] Android 전용 Preview import 검색"
rg -n --type=kotlin 'import androidx\.compose\.ui\.tooling\.preview\.Preview' composeApp/src/commonMain || true

echo
echo "[2] commonMain `@Preview` 사용 위치 확인"
rg -n --type=kotlin '@Preview' composeApp/src/commonMain

Repository: Medicare-Call/Medicare-Call-KMP

Length of output: 2045

commonMain Preview 의존성 추가로 인한 멀티플랫폼 빌드 문제가 생길 수 있어요.

Line 52에서 CMP preview 의존성을 추가했는데, commonMain에 아직도 Android 전용 Preview import(androidx.compose.ui.tooling.preview.Preview)가 남아있어서 iOS/Desktop 빌드가 깨질 거예요.

다음 6개 파일에서 모두 org.jetbrains.compose.ui.tooling.preview.Preview로 바꿔야 합니다:

  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/screen/CallDetailScreen.kt (Line 14)
  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/SpecialNoteSection.kt (Line 18)
  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/DailyCalendar.kt (Line 21)
  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/CareCallSummary.kt (Line 18)
  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/AudioPlayerCard.kt (Line 23)
  • composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/MealSegmentControl.kt (Line 27)
🔧 제안 수정 
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/screen/CallDetailScreen.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/screen/CallDetailScreen.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/SpecialNoteSection.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/SpecialNoteSection.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/DailyCalendar.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/DailyCalendar.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/CareCallSummary.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/CareCallSummary.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/AudioPlayerCard.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/AudioPlayerCard.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
--- a/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/MealSegmentControl.kt
+++ b/composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/feature/calldetail/component/MealSegmentControl.kt
@@
-import androidx.compose.ui.tooling.preview.Preview
+import org.jetbrains.compose.ui.tooling.preview.Preview
🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@composeApp/build.gradle.kts` at line 52, Replace the Android-only Preview
import with the multiplatform Compose Preview import in the affected composable
files: change any import of androidx.compose.ui.tooling.preview.Preview to
org.jetbrains.compose.ui.tooling.preview.Preview in the files containing the
composables CallDetailScreen, SpecialNoteSection, DailyCalendar,
CareCallSummary, AudioPlayerCard, and MealSegmentControl so the commonMain
preview dependency added in build.gradle.kts won't break iOS/Desktop builds.


// Navigation (KMP)
implementation(libs.navigation.compose)
Expand Down Expand Up @@ -158,6 +159,9 @@ dependencies {
// Detekt formatting plugin
detektPlugins(libs.detekt.formatting)

// Compose preview tooling for Android Studio
add("debugImplementation", "org.jetbrains.compose.ui:ui-tooling:1.10.1")

Comment on lines +165 to +167
Copy link
Copy Markdown

@coderabbitai coderabbitai bot Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# 목적:
# tooling 관련 하드코딩 버전 중복 및 중앙관리 여부 점검

echo "[1] build.gradle.kts 내 ui-tooling 하드코딩 확인"
rg -n 'ui-tooling(-preview)?:[0-9]+\.[0-9]+\.[0-9]+' composeApp/build.gradle.kts

echo
echo "[2] compose accessor 사용 여부 확인"
rg -n 'compose\.uiToolingPreview|compose\.uiTooling' composeApp/build.gradle.kts || true

echo
echo "[3] version catalog 내 tooling 정의 확인"
fd 'libs\.versions\.toml' . -x rg -n 'ui-tooling|tooling-preview|compose' {}

Repository: Medicare-Call/Medicare-Call-KMP

Length of output: 1323

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo "[1] Check full build.gradle.kts to understand compose plugin setup"
head -60 composeApp/build.gradle.kts | tail -20

echo
echo "[2] Check if compose.ui-tooling accessor exists"
grep -n "compose\.ui" composeApp/build.gradle.kts || echo "No direct compose.ui accessors found"

echo
echo "[3] Check gradle plugins and accessors available"
head -30 composeApp/build.gradle.kts

echo
echo "[4] Full libs.versions.toml content"
cat gradle/libs.versions.toml

Repository: Medicare-Call/Medicare-Call-KMP

Length of output: 7392

ui-tooling 버전 문자열이 중복 하드코딩돼서 추후 드리프트 위험이 있어요.

Line 52와 Line 166에서 같은 버전을 문자열로 직접 들고 있어서, Compose 버전 업할 때 한쪽만 바뀌는 실수가 생기기 쉽습니다.

가능하면 버전 카탈로그에 추가해서 통일하는 게 유지보수에 좋아요. gradle/libs.versions.toml의 [libraries] 섹션에 다음처럼 추가한 후 참조하면 됩니다:

compose-ui-tooling-preview = { group = "org.jetbrains.compose.ui", name = "ui-tooling-preview", version.ref = "compose-multiplatform" }
compose-ui-tooling = { group = "org.jetbrains.compose.ui", name = "ui-tooling", version.ref = "compose-multiplatform" }

이렇게 하면 버전 업 시 한 곳만 수정해도 모든 의존성이 따라가니까 드리프트 리스크를 없앨 수 있습니다.

🤖 Prompt for AI Agents 
Verify each finding against the current code and only fix it if needed.

In `@composeApp/build.gradle.kts` around lines 165 - 167, 현재 build.gradle.kts에서
하드코딩된 "org.jetbrains.compose.ui:ui-tooling:1.10.1" (및 다른 위치의
"ui-tooling-preview") 의존성 문자열로 인해 버전 중복 위험이 있습니다; gradle/libs.versions.toml의
[libraries]에 compose-ui-tooling-preview 및 compose-ui-tooling 항목을
추가하고(version.ref = "compose-multiplatform"), build.gradle.kts에서
add("debugImplementation", "org.jetbrains.compose.ui:ui-tooling:1.10.1") 대신 버전
카탈로그 참조(libs.compose-ui-tooling 또는 라이브러리 이름에 맞게 조정)로 교체하여 모든 Compose 툴링 의존성을
중앙에서 관리하도록 수정하세요.

// Firebase (Android only)
add("androidMainImplementation", platform(libs.firebase.bom))
add("androidMainImplementation", libs.google.firebase.analytics)
Expand Down
9 changes: 9 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_button_play.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:viewportWidth="34"
android:viewportHeight="34">
<path
android:pathData="M28.591,14.888C29.621,15.483 29.621,16.97 28.591,17.565L11.205,27.603C10.174,28.198 8.886,27.455 8.886,26.265L8.886,6.189C8.886,4.999 10.174,4.255 11.205,4.85L28.591,14.888Z"
android:fillColor="#1F1F1F"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_check.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<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.6,13.8L8.45,11.65C8.267,11.467 8.033,11.375 7.75,11.375C7.467,11.375 7.233,11.467 7.05,11.65C6.867,11.833 6.775,12.067 6.775,12.35C6.775,12.633 6.867,12.867 7.05,13.05L9.9,15.9C10.1,16.1 10.333,16.2 10.6,16.2C10.867,16.2 11.1,16.1 11.3,15.9L16.95,10.25C17.133,10.067 17.225,9.833 17.225,9.55C17.225,9.267 17.133,9.033 16.95,8.85C16.767,8.667 16.533,8.575 16.25,8.575C15.967,8.575 15.733,8.667 15.55,8.85L10.6,13.8ZM12,22C10.617,22 9.317,21.737 8.1,21.212C6.883,20.687 5.825,19.974 4.925,19.075C4.025,18.176 3.313,17.117 2.788,15.9C2.263,14.683 2.001,13.383 2,12C1.999,10.617 2.262,9.317 2.788,8.1C3.314,6.883 4.026,5.824 4.925,4.925C5.824,4.026 6.882,3.313 8.1,2.788C9.318,2.263 10.618,2 12,2C13.382,2 14.682,2.263 15.9,2.788C17.118,3.313 18.176,4.026 19.075,4.925C19.974,5.824 20.686,6.883 21.213,8.1C21.74,9.317 22.002,10.617 22,12C21.998,13.383 21.735,14.683 21.212,15.9C20.689,17.117 19.976,18.176 19.075,19.075C18.174,19.974 17.115,20.687 15.9,21.213C14.685,21.739 13.385,22.001 12,22Z"
android:fillColor="#10D266"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_leftarrow_date.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="15dp"
android:viewportWidth="14"
android:viewportHeight="15">
<path
android:pathData="M1.5,9.932C-0.5,8.777 -0.5,5.891 1.5,4.736L9,0.406C11,-0.749 13.5,0.694 13.5,3.004L13.5,11.664C13.5,13.974 11,15.417 9,14.262L1.5,9.932Z"
android:fillColor="#ECECEC"/>
</vector>
13 changes: 13 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_report_attention.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="41dp"
android:height="22dp"
android:viewportWidth="41"
android:viewportHeight="22">
<path
android:pathData="M11,0L30,0A11,11 0,0 1,41 11L41,11A11,11 0,0 1,30 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
android:fillColor="#FFA13D"
android:fillAlpha="0.1"/>
<path
android:pathData="M16.234,6.293V6.879C16.223,7.582 16.223,8.625 15.965,9.984L14.863,9.879C15.092,8.713 15.127,7.869 15.144,7.207H10.938V6.293H16.234ZM13.551,8.648V10.816C14.676,10.781 15.836,10.699 16.891,10.547L16.961,11.356C14.769,11.742 12.262,11.777 10.41,11.789L10.305,10.887C10.949,10.881 11.682,10.875 12.449,10.852V8.648H13.551ZM18.695,5.496V8.836H20.137V9.773H18.695V13.383H17.559V5.496H18.695ZM19.035,14.871V15.773H11.898V12.668H13.012V14.871H19.035ZM29.465,5.508V11.449H28.352V5.508H29.465ZM29.465,12.012V15.867H22.563V12.012H29.465ZM23.664,12.902V14.965H28.375V12.902H23.664ZM24.578,6.926C24.566,8.344 25.586,9.621 27.18,10.16L26.629,11.016C25.41,10.611 24.496,9.779 24.016,8.695C23.547,9.85 22.615,10.769 21.355,11.215L20.805,10.336C22.445,9.785 23.441,8.391 23.441,6.926V5.906H24.578V6.926Z"
android:fillColor="#FFA13D"/>
</vector>
12 changes: 12 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_report_normal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="41dp"
android:height="22dp"
android:viewportWidth="41"
android:viewportHeight="22">
<path
android:pathData="M11,0L30,0A11,11 0,0 1,41 11L41,11A11,11 0,0 1,30 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
android:fillColor="#E6FAEF"/>
<path
android:pathData="M20.125,6.984V7.898H18.637V9.234H20.125V10.16H18.637V11.695H17.523V5.496H18.637V6.984H20.125ZM13.34,6.105C14.945,6.105 16.129,7.125 16.141,8.602C16.129,10.066 14.945,11.086 13.34,11.098C11.734,11.086 10.539,10.066 10.551,8.602C10.539,7.125 11.734,6.105 13.34,6.105ZM13.34,7.043C12.356,7.043 11.629,7.676 11.641,8.602C11.629,9.539 12.356,10.148 13.34,10.16C14.324,10.148 15.051,9.539 15.051,8.602C15.051,7.676 14.324,7.043 13.34,7.043ZM15.25,11.977C17.395,11.977 18.73,12.715 18.73,13.981C18.73,15.234 17.395,15.984 15.25,15.973C13.082,15.984 11.723,15.234 11.723,13.981C11.723,12.715 13.082,11.977 15.25,11.977ZM15.25,12.879C13.727,12.879 12.824,13.277 12.836,13.981C12.824,14.695 13.727,15.082 15.25,15.082C16.762,15.082 17.641,14.695 17.641,13.981C17.641,13.277 16.762,12.879 15.25,12.879ZM29.852,6.973V7.875H21.215V6.973H24.988V5.648H26.09V6.973H29.852ZM30.367,13.91V14.813H20.758V13.91H24.988V12.516C23.148,12.404 22.035,11.678 22.035,10.512C22.035,9.246 23.371,8.508 25.539,8.508C27.684,8.508 29.031,9.246 29.031,10.512C29.031,11.678 27.912,12.404 26.09,12.516V13.91H30.367ZM25.539,9.387C24.039,9.387 23.16,9.785 23.172,10.512C23.16,11.238 24.039,11.637 25.539,11.648C27.016,11.637 27.895,11.238 27.895,10.512C27.895,9.785 27.016,9.387 25.539,9.387Z"
android:fillColor="#35C156"/>
</vector>
12 changes: 12 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_report_unrecord.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="23dp"
android:viewportWidth="52"
android:viewportHeight="23">
<path
android:pathData="M11.5,0L40.5,0A11.5,11.5 0,0 1,52 11.5L52,11.5A11.5,11.5 0,0 1,40.5 23L11.5,23A11.5,11.5 0,0 1,0 11.5L0,11.5A11.5,11.5 0,0 1,11.5 0z"
android:fillColor="#F0F0F0"/>
<path
android:pathData="M15.894,7.004V13.906H10.973V7.004H15.894ZM12.074,7.883V13.004H14.816V7.883H12.074ZM19.082,5.996V16.52H17.969V5.996H19.082ZM29.488,5.996V16.496H28.363V5.996H29.488ZM26.359,7.121C26.359,10.191 25.047,12.863 21.449,14.586L20.863,13.684C23.658,12.354 25.018,10.461 25.234,8.012H21.367V7.121H26.359ZM40.727,11.727V12.629H31.117V11.727H35.371V10.731H32.348V8.059H38.406V7.121H32.324V6.242H39.52V8.879H33.449V9.863H39.73V10.731H36.473V11.727H40.727ZM39.578,13.367V16.414H38.453V14.258H32.195V13.367H39.578Z"
android:fillColor="#AFAFAF"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_rightarrow_date.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="15dp"
android:viewportWidth="14"
android:viewportHeight="15">
<path
android:pathData="M12,9.932C14,8.777 14,5.891 12,4.736L4.5,0.406C2.5,-0.749 0,0.694 0,3.004L0,11.664C0,13.974 2.5,15.417 4.5,14.262L12,9.932Z"
android:fillColor="#666666"/>
</vector>
13 changes: 13 additions & 0 deletions composeApp/src/androidMain/res/drawable/ic_uncheck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:pathData="M12,13.414L14.121,15.535C14.321,15.736 14.557,15.836 14.829,15.836C15.1,15.836 15.336,15.736 15.535,15.535C15.734,15.335 15.835,15.099 15.836,14.828C15.837,14.556 15.736,14.321 15.535,14.121L13.414,12L15.535,9.879C15.735,9.678 15.836,9.442 15.836,9.171C15.836,8.899 15.735,8.664 15.535,8.464C15.335,8.265 15.099,8.165 14.828,8.165C14.557,8.164 14.321,8.264 14.121,8.464L12,10.586L9.878,8.464C9.678,8.264 9.442,8.164 9.171,8.165C8.9,8.165 8.664,8.265 8.464,8.464C8.264,8.664 8.164,8.9 8.164,9.172C8.165,9.444 8.265,9.679 8.464,9.879L10.585,12L8.464,14.121C8.264,14.322 8.164,14.557 8.164,14.828C8.165,15.099 8.265,15.335 8.464,15.535C8.663,15.736 8.899,15.836 9.172,15.836C9.444,15.836 9.68,15.736 9.878,15.535L12,13.414ZM19.071,19.071C18.093,20.049 16.987,20.783 15.756,21.272C14.524,21.76 13.272,22.005 12,22.006C10.727,22.006 9.475,21.761 8.243,21.272C7.012,20.782 5.907,20.048 4.928,19.071C3.95,18.094 3.217,16.989 2.728,15.756C2.239,14.523 1.994,13.271 1.994,12C1.994,10.729 2.238,9.477 2.728,8.244C3.218,7.011 3.951,5.906 4.928,4.929C5.906,3.952 7.011,3.218 8.243,2.728C9.476,2.239 10.728,1.994 12,1.994C13.271,1.995 14.523,2.239 15.756,2.728C16.99,3.216 18.094,3.95 19.071,4.929C20.047,5.908 20.78,7.013 21.271,8.244C21.762,9.475 22.007,10.727 22.005,12C22.004,13.273 21.759,14.526 21.272,15.757C20.784,16.988 20.051,18.093 19.071,19.071Z"
android:fillColor="#FF4949"/>
</group>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_button_play.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:viewportWidth="34"
android:viewportHeight="34">
<path
android:pathData="M28.591,14.888C29.621,15.483 29.621,16.97 28.591,17.565L11.205,27.603C10.174,28.198 8.886,27.455 8.886,26.265L8.886,6.189C8.886,4.999 10.174,4.255 11.205,4.85L28.591,14.888Z"
android:fillColor="#1F1F1F"/>
</vector>
12 changes: 12 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_button_stop.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="34dp"
android:height="34dp"
android:viewportWidth="34"
android:viewportHeight="34">
<path
android:pathData="M11.769,6.539C10.325,6.539 9.154,7.71 9.154,9.154V24.846C9.154,26.291 10.325,27.462 11.769,27.462C13.214,27.462 14.385,26.291 14.385,24.846V9.154C14.385,7.71 13.214,6.539 11.769,6.539Z"
android:fillColor="#1F1F1F"/>
<path
android:pathData="M22.231,6.539C20.786,6.539 19.615,7.71 19.615,9.154V24.846C19.615,26.291 20.786,27.462 22.231,27.462C23.675,27.462 24.846,26.291 24.846,24.846V9.154C24.846,7.71 23.675,6.539 22.231,6.539Z"
android:fillColor="#1F1F1F"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_check.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<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.6,13.8L8.45,11.65C8.267,11.467 8.033,11.375 7.75,11.375C7.467,11.375 7.233,11.467 7.05,11.65C6.867,11.833 6.775,12.067 6.775,12.35C6.775,12.633 6.867,12.867 7.05,13.05L9.9,15.9C10.1,16.1 10.333,16.2 10.6,16.2C10.867,16.2 11.1,16.1 11.3,15.9L16.95,10.25C17.133,10.067 17.225,9.833 17.225,9.55C17.225,9.267 17.133,9.033 16.95,8.85C16.767,8.667 16.533,8.575 16.25,8.575C15.967,8.575 15.733,8.667 15.55,8.85L10.6,13.8ZM12,22C10.617,22 9.317,21.737 8.1,21.212C6.883,20.687 5.825,19.974 4.925,19.075C4.025,18.176 3.313,17.117 2.788,15.9C2.263,14.683 2.001,13.383 2,12C1.999,10.617 2.262,9.317 2.788,8.1C3.314,6.883 4.026,5.824 4.925,4.925C5.824,4.026 6.882,3.313 8.1,2.788C9.318,2.263 10.618,2 12,2C13.382,2 14.682,2.263 15.9,2.788C17.118,3.313 18.176,4.026 19.075,4.925C19.974,5.824 20.686,6.883 21.213,8.1C21.74,9.317 22.002,10.617 22,12C21.998,13.383 21.735,14.683 21.212,15.9C20.689,17.117 19.976,18.176 19.075,19.075C18.174,19.974 17.115,20.687 15.9,21.213C14.685,21.739 13.385,22.001 12,22Z"
android:fillColor="#10D266"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_leftarrow_date.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="15dp"
android:viewportWidth="14"
android:viewportHeight="15">
<path
android:pathData="M1.5,9.932C-0.5,8.777 -0.5,5.891 1.5,4.736L9,0.406C11,-0.749 13.5,0.694 13.5,3.004L13.5,11.664C13.5,13.974 11,15.417 9,14.262L1.5,9.932Z"
android:fillColor="#ECECEC"/>
</vector>
13 changes: 13 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_report_attention.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="41dp"
android:height="22dp"
android:viewportWidth="41"
android:viewportHeight="22">
<path
android:pathData="M11,0L30,0A11,11 0,0 1,41 11L41,11A11,11 0,0 1,30 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
android:fillColor="#FFA13D"
android:fillAlpha="0.1"/>
<path
android:pathData="M16.234,6.293V6.879C16.223,7.582 16.223,8.625 15.965,9.984L14.863,9.879C15.092,8.713 15.127,7.869 15.144,7.207H10.938V6.293H16.234ZM13.551,8.648V10.816C14.676,10.781 15.836,10.699 16.891,10.547L16.961,11.356C14.769,11.742 12.262,11.777 10.41,11.789L10.305,10.887C10.949,10.881 11.682,10.875 12.449,10.852V8.648H13.551ZM18.695,5.496V8.836H20.137V9.773H18.695V13.383H17.559V5.496H18.695ZM19.035,14.871V15.773H11.898V12.668H13.012V14.871H19.035ZM29.465,5.508V11.449H28.352V5.508H29.465ZM29.465,12.012V15.867H22.563V12.012H29.465ZM23.664,12.902V14.965H28.375V12.902H23.664ZM24.578,6.926C24.566,8.344 25.586,9.621 27.18,10.16L26.629,11.016C25.41,10.611 24.496,9.779 24.016,8.695C23.547,9.85 22.615,10.769 21.355,11.215L20.805,10.336C22.445,9.785 23.441,8.391 23.441,6.926V5.906H24.578V6.926Z"
android:fillColor="#FFA13D"/>
</vector>
12 changes: 12 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_report_normal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="41dp"
android:height="22dp"
android:viewportWidth="41"
android:viewportHeight="22">
<path
android:pathData="M11,0L30,0A11,11 0,0 1,41 11L41,11A11,11 0,0 1,30 22L11,22A11,11 0,0 1,0 11L0,11A11,11 0,0 1,11 0z"
android:fillColor="#E6FAEF"/>
<path
android:pathData="M20.125,6.984V7.898H18.637V9.234H20.125V10.16H18.637V11.695H17.523V5.496H18.637V6.984H20.125ZM13.34,6.105C14.945,6.105 16.129,7.125 16.141,8.602C16.129,10.066 14.945,11.086 13.34,11.098C11.734,11.086 10.539,10.066 10.551,8.602C10.539,7.125 11.734,6.105 13.34,6.105ZM13.34,7.043C12.356,7.043 11.629,7.676 11.641,8.602C11.629,9.539 12.356,10.148 13.34,10.16C14.324,10.148 15.051,9.539 15.051,8.602C15.051,7.676 14.324,7.043 13.34,7.043ZM15.25,11.977C17.395,11.977 18.73,12.715 18.73,13.981C18.73,15.234 17.395,15.984 15.25,15.973C13.082,15.984 11.723,15.234 11.723,13.981C11.723,12.715 13.082,11.977 15.25,11.977ZM15.25,12.879C13.727,12.879 12.824,13.277 12.836,13.981C12.824,14.695 13.727,15.082 15.25,15.082C16.762,15.082 17.641,14.695 17.641,13.981C17.641,13.277 16.762,12.879 15.25,12.879ZM29.852,6.973V7.875H21.215V6.973H24.988V5.648H26.09V6.973H29.852ZM30.367,13.91V14.813H20.758V13.91H24.988V12.516C23.148,12.404 22.035,11.678 22.035,10.512C22.035,9.246 23.371,8.508 25.539,8.508C27.684,8.508 29.031,9.246 29.031,10.512C29.031,11.678 27.912,12.404 26.09,12.516V13.91H30.367ZM25.539,9.387C24.039,9.387 23.16,9.785 23.172,10.512C23.16,11.238 24.039,11.637 25.539,11.648C27.016,11.637 27.895,11.238 27.895,10.512C27.895,9.785 27.016,9.387 25.539,9.387Z"
android:fillColor="#35C156"/>
</vector>
12 changes: 12 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_report_unrecord.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="52dp"
android:height="23dp"
android:viewportWidth="52"
android:viewportHeight="23">
<path
android:pathData="M11.5,0L40.5,0A11.5,11.5 0,0 1,52 11.5L52,11.5A11.5,11.5 0,0 1,40.5 23L11.5,23A11.5,11.5 0,0 1,0 11.5L0,11.5A11.5,11.5 0,0 1,11.5 0z"
android:fillColor="#F0F0F0"/>
<path
android:pathData="M15.894,7.004V13.906H10.973V7.004H15.894ZM12.074,7.883V13.004H14.816V7.883H12.074ZM19.082,5.996V16.52H17.969V5.996H19.082ZM29.488,5.996V16.496H28.363V5.996H29.488ZM26.359,7.121C26.359,10.191 25.047,12.863 21.449,14.586L20.863,13.684C23.658,12.354 25.018,10.461 25.234,8.012H21.367V7.121H26.359ZM40.727,11.727V12.629H31.117V11.727H35.371V10.731H32.348V8.059H38.406V7.121H32.324V6.242H39.52V8.879H33.449V9.863H39.73V10.731H36.473V11.727H40.727ZM39.578,13.367V16.414H38.453V14.258H32.195V13.367H39.578Z"
android:fillColor="#AFAFAF"/>
</vector>
9 changes: 9 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_rightarrow_date.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="14dp"
android:height="15dp"
android:viewportWidth="14"
android:viewportHeight="15">
<path
android:pathData="M12,9.932C14,8.777 14,5.891 12,4.736L4.5,0.406C2.5,-0.749 0,0.694 0,3.004L0,11.664C0,13.974 2.5,15.417 4.5,14.262L12,9.932Z"
android:fillColor="#666666"/>
</vector>
13 changes: 13 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_uncheck.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:pathData="M12,13.414L14.121,15.535C14.321,15.736 14.557,15.836 14.829,15.836C15.1,15.836 15.336,15.736 15.535,15.535C15.734,15.335 15.835,15.099 15.836,14.828C15.837,14.556 15.736,14.321 15.535,14.121L13.414,12L15.535,9.879C15.735,9.678 15.836,9.442 15.836,9.171C15.836,8.899 15.735,8.664 15.535,8.464C15.335,8.265 15.099,8.165 14.828,8.165C14.557,8.164 14.321,8.264 14.121,8.464L12,10.586L9.878,8.464C9.678,8.264 9.442,8.164 9.171,8.165C8.9,8.165 8.664,8.265 8.464,8.464C8.264,8.664 8.164,8.9 8.164,9.172C8.165,9.444 8.265,9.679 8.464,9.879L10.585,12L8.464,14.121C8.264,14.322 8.164,14.557 8.164,14.828C8.165,15.099 8.265,15.335 8.464,15.535C8.663,15.736 8.899,15.836 9.172,15.836C9.444,15.836 9.68,15.736 9.878,15.535L12,13.414ZM19.071,19.071C18.093,20.049 16.987,20.783 15.756,21.272C14.524,21.76 13.272,22.005 12,22.006C10.727,22.006 9.475,21.761 8.243,21.272C7.012,20.782 5.907,20.048 4.928,19.071C3.95,18.094 3.217,16.989 2.728,15.756C2.239,14.523 1.994,13.271 1.994,12C1.994,10.729 2.238,9.477 2.728,8.244C3.218,7.011 3.951,5.906 4.928,4.929C5.906,3.952 7.011,3.218 8.243,2.728C9.476,2.239 10.728,1.994 12,1.994C13.271,1.995 14.523,2.239 15.756,2.728C16.99,3.216 18.094,3.95 19.071,4.929C20.047,5.908 20.78,7.013 21.271,8.244C21.762,9.475 22.007,10.727 22.005,12C22.004,13.273 21.759,14.526 21.272,15.757C20.784,16.988 20.051,18.093 19.071,19.071Z"
android:fillColor="#FF4949"/>
</group>
</vector>
11 changes: 11 additions & 0 deletions composeApp/src/commonMain/composeResources/drawable/ic_unrecord.xml
View file
Open in desktop
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="M12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2Z"
android:fillColor="#00000000"
android:strokeColor="#FFFFFF"
android:strokeWidth="2"/>
</vector>
Binary file added composeApp/src/commonMain/composeResources/drawable/img_id_card.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions composeApp/src/commonMain/kotlin/com/konkuk/medicarecall/ui/common/component/TopAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.dp
import com.konkuk.medicarecall.resources.Res
import com.konkuk.medicarecall.resources.*
Expand All @@ -27,6 +28,8 @@ fun TopAppBar(
modifier: Modifier = Modifier,
title: String,
onBack: () -> Unit,
titleTextStyle: TextStyle = MediCareCallTheme.typography.SB_20,
titleColor: Color = MediCareCallTheme.colors.gray10,
) {
Column(
modifier = modifier
Expand Down Expand Up @@ -58,8 +61,8 @@ fun TopAppBar(
) {
Text(
text = title,
style = MediCareCallTheme.typography.SB_20,
color = MediCareCallTheme.colors.gray10,
style = titleTextStyle,
color = titleColor,
)
}
Box(modifier = Modifier.size(24.dp))
Expand Down
Loading