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
1 change: 1 addition & 0 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"baseBranch": "main",
"updateInternalDependencies": "patch",
"ignore": [
"@devslab-kr/dds-auth",
"@devslab/compatibility-canary",
"@devslab/react-canary"
]
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ jobs:
- run: pnpm run verify:react:test
- run: pnpm run verify:react:browser
- run: pnpm run verify:react:release
- run: pnpm run verify:auth:test
- run: pnpm run verify:auth:browser
- run: pnpm run verify:auth:release
- run: pnpm run verify:table-react:test
- run: pnpm run verify:table-react:browser
- run: pnpm run verify:table-react:release
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#
# 2. No unconsumed changesets (the release PR was just merged, or a
# version was bumped by hand) → the action runs `pnpm release`, which
# is `changeset publish`: every package whose version is not yet on
# npm is published, and a git tag per package is pushed. Versions
# runs `changeset publish` for the public npm packages. New versions
# are published, and a git tag per package is pushed. Versions
# already on npm are skipped, so re-runs are safe.
#
# The publish only happens after the full verification gate below — the
Expand Down Expand Up @@ -75,6 +75,9 @@ jobs:
- run: pnpm run verify:react:test
- run: pnpm run verify:react:browser
- run: pnpm run verify:react:release
- run: pnpm run verify:auth:test
- run: pnpm run verify:auth:browser
- run: pnpm run verify:auth:release
- run: pnpm run verify:table-react:test
- run: pnpm run verify:table-react:browser
- run: pnpm run verify:table-react:release
Expand Down
2 changes: 1 addition & 1 deletion README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ Source-Available License 1.0을 따른다. compatibility canary는 비공개·
때만 만든다 (명세 §8):
`@devslab/dds-tokens` (✅ 2026-08-13) → `dds-css` v1 인벤토리 (Core 6종 ✅ 2026-08-13, +13종 ✅ 2026-08-15) →
AskLinq 적용 → `dds-icons` (✅ 2026-08-15) → `dds-solid` + `site-kit` → 안드로이드 네이티브 값·테마·모션
(0.6.0, 2026-11-12, Maven Central — 테마·모션·부품·아이콘). 0.7.0(2026-11-13, Maven Central)에서 화면 틀과 `dds-compose-testing` 꾸러미가 생겼다(D-052). 0.8.0(2026-11-13)에서 `DdsSegmentedControl`이 생겼고, 0.8.1에서 어두운 화면의 고른 칸이 밝아졌고(`bg.raised`, D-054), 0.9.0에서 고른 면이 미끄러져 옮겨 가고(D-055), 0.9.1에서 앱이 그 속도를, 0.9.2에서 `DdsTheme`에 자기 글꼴을 넘길 수 있다. RN·Ionic 패키지는 그 제품이 생길 때.
(0.6.0, 2026-11-12, Maven Central — 테마·모션·부품·아이콘). 0.7.0(2026-11-13, Maven Central)에서 화면 틀과 `dds-compose-testing` 꾸러미가 생겼다(D-052). 0.8.0(2026-11-13)에서 `DdsSegmentedControl`이 생겼고, 0.8.1에서 어두운 화면의 고른 칸이 밝아졌고(`bg.raised`, D-054), 0.9.0에서 고른 면이 미끄러져 옮겨 가고(D-055), 0.9.1에서 앱이 그 속도를, 0.9.2에서 `DdsTheme`에 자기 글꼴을 넘길 수 있다. 0.10.0에서 `DdsSocialSignIn`과 로그인 제공자 로고가 추가됐다. RN·Ionic 패키지는 그 제품이 생길 때.

## 입력·선택·공유 달력 확장

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ Priorities live in [`docs/backlog.md`](docs/backlog.md). Packages are created
only when a consumer exists (spec §8):
`@devslab/dds-tokens` (✅ 2026-08-13) → `dds-css` v1 inventory (Core 6 ✅ 2026-08-13, +13 ✅ 2026-08-15) →
AskLinq adoption → `dds-icons` (✅ 2026-08-15) → `dds-solid` + `site-kit` → native Android values, theme and motion
(0.6.0, 2026-11-12, on Maven Central — theme, motion, components, icons). 0.7.0 (2026-11-13, on Maven Central) adds the screen frame and the `dds-compose-testing` artifact (D-052). 0.8.0 (2026-11-13) adds `DdsSegmentedControl`, 0.8.1 its lighter chosen face in dark (`bg.raised`, D-054), 0.9.0 makes that face slide between choices (D-055), 0.9.1 lets an app set the slide speed, and 0.9.2 lets an app pass its own typeface to `DdsTheme`. RN and Ionic packages only when such a product exists.
(0.6.0, 2026-11-12, on Maven Central — theme, motion, components, icons). 0.7.0 (2026-11-13, on Maven Central) adds the screen frame and the `dds-compose-testing` artifact (D-052). 0.8.0 (2026-11-13) adds `DdsSegmentedControl`, 0.8.1 its lighter chosen face in dark (`bg.raised`, D-054), 0.9.0 makes that face slide between choices (D-055), 0.9.1 lets an app set the slide speed, and 0.9.2 lets an app pass its own typeface to `DdsTheme`. 0.10.0 adds `DdsSocialSignIn` with selectable providers and their marks. RN and Ionic packages only when such a product exists.

## Input, choice and shared calendar additions

Expand Down
8 changes: 8 additions & 0 deletions android/CHANGELOG.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
`kr.devslab:dds-android-tokens`, `kr.devslab:dds-compose`, 그리고 0.7.0부터 `kr.devslab:dds-compose-testing`은 한 버전을 쓰고, 웹 패키지와는
버전이 따로다(D-048). 릴리스는 `android-v<버전>` 태그로 낸다.

## 0.10.0 — 2026-11-15

**새로 생긴 것**

- **`DdsSocialSignIn`**은 앱이 선택한 로그인 방법 중 처음 세 개를 보여주고 나머지는 시트에 담는다.
웹 DDS Auth와 제공자 ID 17개를 공유하며 로고 13개를 제공한다. 앱에서 로고를 지정하고 인증과 세션을 처리한다.
사용법은 [소셜 로그인 선택 UI](README.ko.md#소셜-로그인-선택-ui)에 있다.

## 0.9.2 — 2026-11-13

**새로 생긴 것**
Expand Down
8 changes: 8 additions & 0 deletions android/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@
`kr.devslab:dds-android-tokens`, `kr.devslab:dds-compose` and (from 0.7.0) `kr.devslab:dds-compose-testing` share one version,
separate from the web packages (D-048). Releases are cut by an `android-v<version>` tag.

## 0.10.0 — 2026-11-15

**New**

- **`DdsSocialSignIn`** shows the app's first three sign-in methods and puts the rest in a sheet.
The 17 provider IDs match DDS Auth on the web. DDS ships 13 marks and accepts app-provided artwork.
The app handles authentication and sessions. See [Social sign-in options](README.md#social-sign-in-options).

## 0.9.2 — 2026-11-13

**New**
Expand Down
26 changes: 24 additions & 2 deletions android/README.ko.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies {

```kotlin
dependencies {
implementation("kr.devslab:dds-compose:0.9.2")
androidTestImplementation("kr.devslab:dds-compose-testing:0.9.2")
implementation("kr.devslab:dds-compose:0.10.0")
androidTestImplementation("kr.devslab:dds-compose-testing:0.10.0")
}
```

Expand Down Expand Up @@ -72,6 +72,28 @@ Maven Central에 올라가기 전에는 로컬 저장소에서 받는다.
mavenLocal { content { includeGroup("kr.devslab") } }
```

## 소셜 로그인 선택 UI

`DdsSocialSignIn`은 앱이 연결한 제공자를 전달받아 순서대로 표시한다. 처음 세 수단은 화면에 표시하고 나머지는 ‘다른 로그인 방법’ 시트에서 고를 수 있다. 앱은 각 버튼의 현지화된 문구를 지정한다. DDS가 제공자 로고를 표시하며 `DdsSignInMethod.icon`으로 앱의 에셋을 지정할 수 있다. 인증을 시작할 때 `onSelect`에서 선택한 제공자 ID를 받는다.

```kotlin
DdsSocialSignIn(
methods = listOf(
DdsSignInMethod(DdsSocialProvider.Google, "Google로 계속하기"),
DdsSignInMethod(DdsSocialProvider.Kakao, "카카오 로그인"),
DdsSignInMethod(DdsSocialProvider.Naver, "네이버 로그인"),
DdsSignInMethod(DdsSocialProvider.Discord, "Discord로 로그인"),
),
onSelect = { provider -> startSignIn(provider.id) },
)
```

어떤 로그인 수단을 제공할지와 진행 상태는 호출 앱이 정한다. OAuth 설정, 계정 연결, 세션 저장은 해당 앱의 인증 계층이 처리한다. Android 컴포넌트의 공개 제공자 ID는 웹의 [`dds-auth`](../packages/dds-auth/README.ko.md) 카탈로그와 같다.

Google, 카카오, 네이버, LINE, Microsoft, LinkedIn, GitHub, Discord, Figma, Notion, X, Slack, Zoom 로고를 함께 제공한다. GitLab은 기본으로 글자로 표시한다. Apple, Facebook, WeChat은 앱에서 해당 제공자의 승인된 에셋이나 전용 버튼을 사용할 수 있다.

Android의 네이버 아이콘은 공식 배포본 `NAVER_login_KR/NAVER_login_Light_KR_green_icon_H56.png` 원본이다. 카카오, Microsoft, GitHub, Slack의 SVG는 원래 색을 유지한 채 PNG로 변환했다. 어두운 테마에서는 GitHub와 카카오 원본에 흰 배경을 받치고 X는 공식 흰색 로고를 사용한다. 공식 출처와 원본 체크섬은 [공통 제공자 에셋 출처 기록](../packages/dds-auth/assets/provenance.json)에서 확인할 수 있다.

## 값을 바꿀 때

값은 여기서 고치지 않는다. `tokens/*.json`(네이티브 전용 값은 `tokens/native.json`)을
Expand Down
26 changes: 24 additions & 2 deletions android/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ dependencies {

```kotlin
dependencies {
implementation("kr.devslab:dds-compose:0.9.2")
androidTestImplementation("kr.devslab:dds-compose-testing:0.9.2")
implementation("kr.devslab:dds-compose:0.10.0")
androidTestImplementation("kr.devslab:dds-compose-testing:0.10.0")
}
```

Expand Down Expand Up @@ -72,6 +72,28 @@ Until the packages are on Maven Central, install them from the local repository:
mavenLocal { content { includeGroup("kr.devslab") } }
```

## Social sign-in options

Pass the app's supported methods to `DdsSocialSignIn` in display order. It shows the first three and offers the remaining methods in a sheet. Each method takes a localized label. DDS draws the bundled brand mark by default, and `DdsSignInMethod.icon` accepts app-provided artwork. `onSelect` provides the public provider ID through the selected `DdsSocialProvider`.

```kotlin
DdsSocialSignIn(
methods = listOf(
DdsSignInMethod(DdsSocialProvider.Google, "Continue with Google"),
DdsSignInMethod(DdsSocialProvider.Kakao, "Continue with Kakao"),
DdsSignInMethod(DdsSocialProvider.Naver, "Continue with Naver"),
DdsSignInMethod(DdsSocialProvider.Discord, "Continue with Discord"),
),
onSelect = { provider -> startSignIn(provider.id) },
)
```

The host controls availability and progress. Its auth layer configures OAuth, links identities, and stores sessions. The public provider IDs match the web [`dds-auth`](../packages/dds-auth/README.md) catalog.

The bundled assets cover Google, Kakao, Naver, LINE, Microsoft, LinkedIn, GitHub, Discord, Figma, Notion, X, Slack, and Zoom. GitLab uses text by default. Apps can supply approved artwork or a dedicated provider button for Apple, Facebook, and WeChat.

Android uses the original full Naver green icon from `NAVER_login_KR/NAVER_login_Light_KR_green_icon_H56.png`. SVG marks from Kakao, Microsoft, GitHub, and Slack are rasterized with their original colors. The dark variants keep the original GitHub and Kakao marks on a white backing and use X’s white artwork. For the official sources and original checksums, see the [shared provider asset provenance](../packages/dds-auth/assets/provenance.json).

## Changing a value

Values are not edited here. Change `tokens/*.json` (native-only values live in
Expand Down
30 changes: 30 additions & 0 deletions android/catalog/src/main/kotlin/kr/devslab/dds/catalog/Pages.kt
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,9 @@ import kr.devslab.dds.compose.component.DdsMenuDivider
import kr.devslab.dds.compose.component.DdsMenuItem
import kr.devslab.dds.compose.component.DdsSearchField
import kr.devslab.dds.compose.component.DdsSelectField
import kr.devslab.dds.compose.component.DdsSignInMethod
import kr.devslab.dds.compose.component.DdsSocialProvider
import kr.devslab.dds.compose.component.DdsSocialSignIn
import kr.devslab.dds.compose.component.DdsSegment
import kr.devslab.dds.compose.component.DdsSegmentedControl
import kr.devslab.dds.compose.component.DdsTabs
Expand Down Expand Up @@ -349,9 +352,36 @@ fun PartsPage() {
var period by rememberSaveable { mutableStateOf("week") }
var menu by remember { mutableStateOf(false) }
var sheet by rememberSaveable { mutableStateOf(false) }
var lastSignInMethod by rememberSaveable { mutableStateOf<String?>(null) }
val toasts = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
PageBody {
DdsSection("Sign-in methods", description = "An app chooses the providers, their order and their labels.") {
DdsSocialSignIn(
methods = listOf(
DdsSignInMethod(DdsSocialProvider.Google, "Google로 계속하기"),
DdsSignInMethod(DdsSocialProvider.Kakao, "카카오 로그인"),
DdsSignInMethod(DdsSocialProvider.Naver, "네이버 로그인"),
DdsSignInMethod(DdsSocialProvider.Line, "LINE으로 로그인"),
DdsSignInMethod(DdsSocialProvider.Microsoft, "Microsoft로 로그인"),
DdsSignInMethod(DdsSocialProvider.LinkedIn, "LinkedIn으로 로그인"),
DdsSignInMethod(DdsSocialProvider.Apple, "Apple로 로그인"),
DdsSignInMethod(DdsSocialProvider.Facebook, "Facebook으로 로그인"),
DdsSignInMethod(DdsSocialProvider.GitHub, "GitHub로 로그인"),
DdsSignInMethod(DdsSocialProvider.GitLab, "GitLab으로 로그인"),
DdsSignInMethod(DdsSocialProvider.Discord, "Discord로 로그인"),
DdsSignInMethod(DdsSocialProvider.Figma, "Figma로 로그인"),
DdsSignInMethod(DdsSocialProvider.Notion, "Notion으로 로그인"),
DdsSignInMethod(DdsSocialProvider.X, "X로 로그인"),
DdsSignInMethod(DdsSocialProvider.Slack, "Slack으로 로그인"),
DdsSignInMethod(DdsSocialProvider.Zoom, "Zoom으로 로그인"),
DdsSignInMethod(DdsSocialProvider.WeChat, "WeChat으로 로그인"),
),
onSelect = { lastSignInMethod = it.id },
gutter = 0.dp,
)
lastSignInMethod?.let { Text("Selected provider: $it", style = DdsTheme.typography.body2) }
}
DdsSection("Buttons", description = "One height (48). Loading keeps the size.") {
DdsCard {
Column(verticalArrangement = Arrangement.spacedBy(DdsSpace.s12.dp)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import androidx.compose.ui.test.onNodeWithTag
import androidx.compose.ui.platform.testTag
import androidx.compose.ui.test.assertCountEquals
import androidx.compose.ui.test.assertIsEnabled
import androidx.compose.ui.test.assertIsNotEnabled
import androidx.compose.ui.test.assertIsFocused
import androidx.compose.ui.test.assertIsOn
import androidx.compose.ui.test.hasContentDescription
Expand Down Expand Up @@ -65,6 +66,9 @@ import kr.devslab.dds.compose.layout.DdsCenteredColumn
import kr.devslab.dds.compose.layout.DdsCenteredTitle
import kr.devslab.dds.compose.component.DdsSearchField
import kr.devslab.dds.compose.component.DdsSelectField
import kr.devslab.dds.compose.component.DdsSignInMethod
import kr.devslab.dds.compose.component.DdsSocialProvider
import kr.devslab.dds.compose.component.DdsSocialSignIn
import kr.devslab.dds.compose.component.DdsTabs
import kr.devslab.dds.compose.component.DdsTextField
import kr.devslab.dds.compose.component.DdsTone
Expand Down Expand Up @@ -95,6 +99,36 @@ class ScreenReaderTest {

private fun show(content: @Composable () -> Unit) = rule.setContent { DdsTheme { content() } }

@Test
fun additionalSignInMethodsKeepTheirLabelsAndCannotRestartPendingAuth() {
var selected: DdsSocialProvider? by mutableStateOf(null)
val attempts = mutableListOf<DdsSocialProvider>()
show {
DdsSocialSignIn(
methods = listOf(
DdsSignInMethod(DdsSocialProvider.Google, "Google로 로그인"),
DdsSignInMethod(DdsSocialProvider.Kakao, "카카오 로그인"),
DdsSignInMethod(DdsSocialProvider.Naver, "네이버 로그인"),
DdsSignInMethod(DdsSocialProvider.Discord, "Discord로 로그인"),
DdsSignInMethod(DdsSocialProvider.Zoom, "Zoom으로 로그인", enabled = false),
),
pending = selected,
moreLabel = "다른 로그인 방법",
closeLabel = "선택 닫기",
onSelect = { attempts.add(it); selected = it },
)
}
rule.onNodeWithText("Discord로 로그인").assertDoesNotExist()
rule.onNodeWithText("다른 로그인 방법").performClick()
rule.onNode(hasText("다른 로그인 방법") and keyIsDefined(SemanticsProperties.Heading)).assertExists()
rule.onNodeWithText("Zoom으로 로그인").assertIsNotEnabled()
rule.onNodeWithText("Discord로 로그인").performClick().performClick()
rule.runOnIdle { assertEquals(listOf(DdsSocialProvider.Discord), attempts) }
rule.onNodeWithContentDescription("선택 닫기").performClick()
rule.onNodeWithText("Discord로 로그인").assertDoesNotExist()
rule.onNodeWithText("다른 로그인 방법").assertIsNotEnabled()
}

// --- text field ---------------------------------------------------------

@Test
Expand Down
Loading
Loading