Skip to content

Commit 00aa514

Browse files
authored
Merge pull request #3 from YAPP-Github/BOOK-37-chore/#2
chore: 프로젝트 초기 설정
2 parents 8dfcd26 + a3b557a commit 00aa514

32 files changed

+790
-164
lines changed

.editorconfig

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
indent_size = 4
6+
indent_style = space
7+
max_line_length = 150
8+
insert_final_newline = true
9+
trim_trailing_whitespace = true
10+
11+
[*.{kt,kts}]
12+
ij_kotlin_allow_trailing_comma = true
13+
ij_kotlin_allow_trailing_comma_on_call_site = true

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
2-
✅ PR 제목 작성 가이드
3-
형식: [<라벨>] <작업 요약>
4-
예: [feat] 로그인 페이지 구현, [fix] 버튼 클릭 버그 수정
2+
✅ PR 제목 작성 가이드
3+
형식: <라벨>: <작업 요약>
4+
예: feat: 로그인 페이지 구현, fix: 버튼 클릭 버그 수정
55
-->
66

77
## 🔗 관련 이슈
@@ -10,7 +10,7 @@
1010

1111
## 📙 작업 설명
1212
<!-- 주요 수정 사항이나 개발 내용을 요약해주세요 -->
13-
-
13+
-
1414

1515
## 🧪 테스트 내역 (선택)
1616
- [ ] 주요 기능 정상 동작 확인
@@ -26,4 +26,4 @@
2626

2727
## 💬 추가 설명 or 리뷰 포인트 (선택)
2828
<!-- 리뷰어가 중점적으로 봐야 할 부분이나 설명이 필요한 내용을 자유롭게 작성해주세요 -->
29-
-
29+
-

.github/labeler.yml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,30 @@ enable:
55
labels:
66
'✨ feat':
77
include:
8-
- '\bfeat\b'
8+
- pattern: '^feat:'
9+
scope: title
910

1011
'🐞 fix':
1112
include:
12-
- '\bfix\b'
13+
- pattern: '^fix:'
14+
scope: title
1315

1416
'🔨 refactor':
1517
include:
16-
- '\brefactor\b'
18+
- pattern: '^refactor:'
19+
scope: title
1720

1821
'📃 docs':
1922
include:
20-
- '\bdocs\b'
23+
- pattern: '^docs:'
24+
scope: title
2125

2226
'⚙️ chore':
2327
include:
24-
- '\bchore\b'
28+
- pattern: '^chore:'
29+
scope: title
2530

2631
'✅ test':
2732
include:
28-
- '\btest\b'
33+
- pattern: '^test:'
34+
scope: title

.github/workflows/android-ci.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Android CI
2+
3+
env:
4+
GRADLE_OPTS: "-Dorg.gradle.jvmargs=-Xmx4g -Dorg.gradle.daemon=false"
5+
GRADLE_BUILD_ACTION_CACHE_DEBUG_ENABLED: true
6+
7+
on:
8+
pull_request:
9+
10+
concurrency:
11+
group: build-${{ github.ref }}
12+
cancel-in-progress: true
13+
14+
jobs:
15+
ci-build:
16+
runs-on: ubuntu-latest
17+
18+
if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-ci') }}
19+
20+
steps:
21+
- name: Checkout
22+
uses: actions/checkout@v4
23+
24+
- name: Setup JDK 17
25+
uses: actions/setup-java@v4
26+
with:
27+
distribution: 'corretto'
28+
java-version: 17
29+
30+
- name: Setup Android SDK
31+
uses: android-actions/setup-android@v2
32+
33+
- name: Setup Gradle
34+
uses: gradle/gradle-build-action@v2
35+
with:
36+
gradle-home-cache-cleanup: true
37+
38+
- name: Generate local.properties
39+
run: |
40+
echo '${{ secrets.LOCAL_PROPERTIES }}' >> ./local.properties
41+
42+
- name: Code style checks
43+
run: |
44+
./gradlew ktlintCheck detekt
45+
46+
- name: Run build
47+
run: ./gradlew buildDebug --stacktrace

app/build.gradle.kts

Lines changed: 13 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,24 @@
11
plugins {
2-
alias(libs.plugins.android.application)
3-
alias(libs.plugins.kotlin.android)
4-
alias(libs.plugins.kotlin.compose)
2+
alias(libs.plugins.booket.android.application)
3+
alias(libs.plugins.booket.android.hilt)
4+
alias(libs.plugins.booket.android.application.compose)
55
}
66

77
android {
88
namespace = "com.ninecraft.booket"
9-
compileSdk = 35
10-
11-
defaultConfig {
12-
applicationId = "com.ninecraft.booket"
13-
minSdk = 28
14-
targetSdk = 35
15-
versionCode = 1
16-
versionName = "1.0"
17-
18-
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
19-
}
209

2110
buildTypes {
2211
release {
2312
isMinifyEnabled = false
2413
proguardFiles(
2514
getDefaultProguardFile("proguard-android-optimize.txt"),
26-
"proguard-rules.pro"
15+
"proguard-rules.pro",
2716
)
2817
}
2918
}
30-
compileOptions {
31-
sourceCompatibility = JavaVersion.VERSION_11
32-
targetCompatibility = JavaVersion.VERSION_11
33-
}
34-
kotlinOptions {
35-
jvmTarget = "11"
36-
}
19+
3720
buildFeatures {
38-
compose = true
21+
buildConfig = true
3922
}
4023
}
4124

@@ -45,15 +28,14 @@ dependencies {
4528
implementation(libs.androidx.lifecycle.runtime.ktx)
4629
implementation(libs.androidx.activity.compose)
4730
implementation(platform(libs.androidx.compose.bom))
48-
implementation(libs.androidx.ui)
49-
implementation(libs.androidx.ui.graphics)
50-
implementation(libs.androidx.ui.tooling.preview)
51-
implementation(libs.androidx.material3)
31+
implementation(libs.androidx.compose.ui)
32+
implementation(libs.androidx.compose.ui.graphics)
33+
implementation(libs.androidx.compose.ui.tooling.preview)
34+
implementation(libs.androidx.compose.material3)
5235
testImplementation(libs.junit)
5336
androidTestImplementation(libs.androidx.junit)
54-
androidTestImplementation(libs.androidx.espresso.core)
5537
androidTestImplementation(platform(libs.androidx.compose.bom))
56-
androidTestImplementation(libs.androidx.ui.test.junit4)
57-
debugImplementation(libs.androidx.ui.tooling)
58-
debugImplementation(libs.androidx.ui.test.manifest)
38+
androidTestImplementation(libs.androidx.compose.ui.test.junit4)
39+
debugImplementation(libs.androidx.compose.ui.tooling)
40+
debugImplementation(libs.androidx.compose.ui.test.manifest)
5941
}

app/src/androidTest/java/com/ninecraft/booket/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/src/main/java/com/ninecraft/booket/ui/theme/Type.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/src/main/java/com/ninecraft/booket/MainActivity.kt renamed to app/src/main/kotlin/com/ninecraft/booket/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class MainActivity : ComponentActivity() {
2222
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
2323
Greeting(
2424
name = "Android",
25-
modifier = Modifier.padding(innerPadding)
25+
modifier = Modifier.padding(innerPadding),
2626
)
2727
}
2828
}
@@ -34,7 +34,7 @@ class MainActivity : ComponentActivity() {
3434
fun Greeting(name: String, modifier: Modifier = Modifier) {
3535
Text(
3636
text = "Hello $name!",
37-
modifier = modifier
37+
modifier = modifier,
3838
)
3939
}
4040

app/src/main/java/com/ninecraft/booket/ui/theme/Color.kt renamed to app/src/main/kotlin/com/ninecraft/booket/ui/theme/Color.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@ val Pink80 = Color(0xFFEFB8C8)
88

99
val Purple40 = Color(0xFF6650a4)
1010
val PurpleGrey40 = Color(0xFF625b71)
11-
val Pink40 = Color(0xFF7D5260)
11+
val Pink40 = Color(0xFF7D5260)

app/src/main/java/com/ninecraft/booket/ui/theme/Theme.kt renamed to app/src/main/kotlin/com/ninecraft/booket/ui/theme/Theme.kt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package com.ninecraft.booket.ui.theme
22

3-
import android.app.Activity
43
import android.os.Build
54
import androidx.compose.foundation.isSystemInDarkTheme
65
import androidx.compose.material3.MaterialTheme
@@ -14,31 +13,32 @@ import androidx.compose.ui.platform.LocalContext
1413
private val DarkColorScheme = darkColorScheme(
1514
primary = Purple80,
1615
secondary = PurpleGrey80,
17-
tertiary = Pink80
16+
tertiary = Pink80,
1817
)
1918

2019
private val LightColorScheme = lightColorScheme(
2120
primary = Purple40,
2221
secondary = PurpleGrey40,
23-
tertiary = Pink40
22+
tertiary = Pink40,
2423

25-
/* Other default colors to override
26-
background = Color(0xFFFFFBFE),
27-
surface = Color(0xFFFFFBFE),
28-
onPrimary = Color.White,
29-
onSecondary = Color.White,
30-
onTertiary = Color.White,
31-
onBackground = Color(0xFF1C1B1F),
32-
onSurface = Color(0xFF1C1B1F),
33-
*/
24+
/*
25+
* Other default colors to override
26+
* background = Color(0xFFFFFBFE),
27+
* surface = Color(0xFFFFFBFE),
28+
* onPrimary = Color.White,
29+
* onSecondary = Color.White,
30+
* onTertiary = Color.White,
31+
* onBackground = Color(0xFF1C1B1F),
32+
* onSurface = Color(0xFF1C1B1F),
33+
*/
3434
)
3535

3636
@Composable
3737
fun BooketAndroidTheme(
3838
darkTheme: Boolean = isSystemInDarkTheme(),
3939
// Dynamic color is available on Android 12+
4040
dynamicColor: Boolean = true,
41-
content: @Composable () -> Unit
41+
content: @Composable () -> Unit,
4242
) {
4343
val colorScheme = when {
4444
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
@@ -53,6 +53,6 @@ fun BooketAndroidTheme(
5353
MaterialTheme(
5454
colorScheme = colorScheme,
5555
typography = Typography,
56-
content = content
56+
content = content,
5757
)
5858
}

0 commit comments

Comments
 (0)