Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
941c88f
:bug: Fix(#103): 라벨 리스트 화면 온보딩 수정
SuHyeon00 Nov 22, 2025
3328466
:bug: Feature(#103): 마이에디슨 온보딩 라벨탭 추가
SuHyeon00 Nov 22, 2025
675da77
:sparkles: Feature(#127): 스페이스뷰 프리뷰 제거
SuHyeon00 Nov 22, 2025
b88af58
:art: Feature(#127): 하드 코딩된 값 상수 기반으로 수정
SuHyeon00 Nov 30, 2025
300f225
:art: Feature(#127): 중복 코드 수정
SuHyeon00 Nov 30, 2025
b9edbe2
:art: Feature(#127): sqrt 사용 개선
SuHyeon00 Nov 30, 2025
861dd92
:truck: Rename(#127): 중복 함수 명 네이밍 수정
SuHyeon00 Nov 30, 2025
05646c3
:recycle: Refactor(#127): string formatting
SuHyeon00 Nov 30, 2025
6a6e3af
:bug: Fix(#127): LabelTabScreen 렌더링 컨디션 수정
SuHyeon00 Nov 30, 2025
af77ee8
Merge branch 'fix/register-logic' of https://github.com/UMC-Edison/Ed…
JaeminHwang49 Dec 7, 2025
64d7984
Feature(#132): MyEdisonNav 라벨 아이콘 수정
JaeminHwang49 Dec 13, 2025
517238a
Feat(#132): 빈 버블 보관함 화면 추가(버블 작성 화면 연결 X)
JaeminHwang49 Dec 13, 2025
44243c4
Feature(#132): 버튼 버블 입력 화면과 연결
JaeminHwang49 Dec 13, 2025
1e093e4
Chore(#132): 영감을 기록하기 버튼 연결
JaeminHwang49 Jan 2, 2026
9de6018
Fix(#132): Fix Conflict
JaeminHwang49 Jan 2, 2026
0235b48
Merge branch 'develop' of https://github.com/UMC-Edison/Edison-AOS in…
JaeminHwang49 Jan 5, 2026
8da779d
Fix(#132): 색상 파일에 그라데이션, 배경 색 추가
JaeminHwang49 Jan 5, 2026
e954403
Fix(#132): 메이 리뷰 반영
JaeminHwang49 Jan 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
Binary file added app/src/main/ic_label-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,21 @@ import com.umc.edison.ui.components.calculateBubbleSize
import com.umc.edison.ui.navigation.NavRoute
import com.umc.edison.ui.onboarding.BubbleSpaceOnboarding
import com.umc.edison.ui.theme.Gray300
import com.umc.edison.ui.theme.Gray500
import com.umc.edison.ui.theme.Gray700
import com.umc.edison.ui.theme.Gray800
import com.umc.edison.ui.theme.Gray900
import com.umc.edison.ui.theme.White000
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.Surface
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.umc.edison.R
import com.umc.edison.ui.theme.EdisonTypography
import com.umc.edison.ui.theme.EmptyViewCtaBg
import com.umc.edison.ui.theme.GradientBlue
import com.umc.edison.ui.theme.GradientPink
import com.umc.edison.ui.theme.GradientYellow

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -99,6 +111,15 @@ fun BubbleStorageScreen(
}
},
) {
if (uiState.bubbles.isEmpty()) {
BubbleStorageEmptyView(
onCtaClick = {
navHostController.navigate(NavRoute.BubbleEdit.createRoute())
}
)
return@BaseContent
}

var onBubbleClick: (BubbleModel) -> Unit = {}
var onBubbleLongClick: (BubbleModel) -> Unit = {}

Expand Down Expand Up @@ -293,3 +314,55 @@ fun BubbleStorageScreen(
}
}
}

@Composable
private fun BubbleStorageEmptyView(
onCtaClick: () -> Unit,
modifier: Modifier = Modifier,
) {

Column(
modifier = modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = stringResource(R.string.bubble_storage_empty_title),
style = EdisonTypography.displayLarge,
color = Gray700,
textAlign = TextAlign.Center,
)

Spacer(modifier = Modifier.height(24.dp))

Text(
text = stringResource(R.string.bubble_storage_empty_subtitle),
style = EdisonTypography.bodyMedium,
color = Gray500,
textAlign = TextAlign.Center,
)

Spacer(modifier = Modifier.height(4.dp))

val ctaTextBrush = Brush.horizontalGradient(
colors = listOf(
GradientYellow,
GradientPink,
GradientBlue,
)
)

Surface(
onClick = onCtaClick,
shape = RoundedCornerShape(100.dp),
color = EmptyViewCtaBg,
) {
Text(
text = stringResource(R.string.bubble_storage_empty_cta),
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
style = MaterialTheme.typography.displaySmall.copy(brush = ctaTextBrush),
textAlign = TextAlign.Center,
)
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -234,4 +234,4 @@ private fun OnboardingImagePlaceholder(
alignment = Alignment.Center,
contentScale = ContentScale.Crop,
)
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/umc/edison/ui/navigation/NavRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ sealed class NavRoute(val route: String) {
}

data object BubbleEdit : NavRoute("$MY_EDISON_ROUTE/edit") {
fun createRoute(bubbleId: String?): String {
return if (bubbleId != null) {
fun createRoute(bubbleId: String? = null): String {
return if (!bubbleId.isNullOrEmpty()) {
"$route?bubbleId=$bubbleId"
} else {
route
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ fun BubbleGraphScreen(
val transformedOffset = (tapOffset - offset) / scale
val radius = BUBBLE_DOT_RADIUS
val touchRadius = radius * 1.5f

uiState.bubbles.forEach { positionedBubble ->
val dx = transformedOffset.x - positionedBubble.position.x
val dy = transformedOffset.y - positionedBubble.position.y
Expand Down
7 changes: 6 additions & 1 deletion app/src/main/java/com/umc/edison/ui/theme/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ val Orange100 = Color(0xFFFFE2CD)
val LightGreen100 = Color(0XFFD5FFAB)
val LightBlue100 = Color(0XFFA8F4F7)

val EmptyViewCtaBg = Color(0xFFFFF7F7)
val GradientYellow = Color(0xFFF2F227)
val GradientPink = Color(0xFFFF87D5)
val GradientBlue = Color(0xFF5BADFF)

val ColorPickerList = listOf(
Red100,
Yellow100,
Expand All @@ -62,4 +67,4 @@ val ColorPickerList = listOf(
Green200,
Purple100,
Color(0xFFC9CBD3),
)
)
21 changes: 3 additions & 18 deletions app/src/main/res/drawable/ic_label.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,7 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<group>
<clip-path
android:pathData="M0,0h24v24h-24z"/>
<path
android:pathData="M22.59,15.41L15.42,22.58C15.234,22.766 15.014,22.913 14.771,23.014C14.528,23.115 14.268,23.167 14.005,23.167C13.742,23.167 13.482,23.115 13.239,23.014C12.996,22.913 12.776,22.766 12.59,22.58L4,14V4H14L22.59,12.59C22.962,12.965 23.172,13.472 23.172,14C23.172,14.528 22.962,15.035 22.59,15.41Z"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#ffffff"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
<path
android:pathData="M8,8H8.01"
android:strokeLineJoin="round"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#000000"
android:strokeLineCap="round"/>
</group>
<path
android:pathData="M1.173,10.628C0.802,10.998 0.506,11.437 0.305,11.922C0.104,12.406 0,12.925 0,13.45C0,13.974 0.104,14.494 0.305,14.978C0.506,15.462 0.802,15.902 1.173,16.272L7.766,22.832C8.52,23.58 9.539,24 10.602,24C11.664,24 12.684,23.58 13.438,22.832L22.778,13.538C23.521,12.797 23.942,11.793 23.952,10.744L24,4.02C24.003,3.491 23.9,2.966 23.699,2.477C23.497,1.988 23.201,1.543 22.826,1.169C22.452,0.796 22.007,0.5 21.517,0.299C21.028,0.098 20.503,-0.003 19.974,0L13.474,0.028C12.416,0.029 11.402,0.449 10.654,1.196L1.173,10.628ZM18,8C17.469,8 16.961,7.789 16.586,7.414C16.211,7.039 16,6.53 16,6C16,5.47 16.211,4.961 16.586,4.586C16.961,4.211 17.469,4 18,4C18.53,4 19.039,4.211 19.414,4.586C19.789,4.961 20,5.47 20,6C20,6.53 19.789,7.039 19.414,7.414C19.039,7.789 18.53,8 18,8Z"
android:fillColor="#3A3D40"/>
</vector>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_label.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_label"/>
<foreground android:drawable="@mipmap/ic_label_foreground"/>
</adaptive-icon>
5 changes: 5 additions & 0 deletions app/src/main/res/mipmap-anydpi-v26/ic_label_round.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_label"/>
<foreground android:drawable="@mipmap/ic_label_foreground"/>
</adaptive-icon>
Binary file added app/src/main/res/mipmap-hdpi/ic_label.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-hdpi/ic_label_round.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_label.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-mdpi/ic_label_round.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_label.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xhdpi/ic_label_round.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxhdpi/ic_label.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/mipmap-xxxhdpi/ic_label.webp
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 4 additions & 1 deletion app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,7 @@
<string name="delete_account_agree_3">3. 해당 계정으로 Edison에 재가입할 경우, 새로운 계정으로 간주됩니다.</string>
<string name="delete_account_agree">안내 사항을 모두 확인하였으며, 이에 동의합니다.</string>
<string name="login_question">로그인이 필요한 기능입니다</string>
</resources>
<string name="bubble_storage_empty_title">지난 한 달간 새로 작성한\n버블이 없어요!</string>
<string name="bubble_storage_empty_subtitle">에디슨과 함께</string>
<string name="bubble_storage_empty_cta">찰나의 영감을 기록하기</string>
</resources>