Skip to content

Commit 0136304

Browse files
mangbaammangbaam
authored
Merge pull request #245 from boostcampwm-2022/develop
첫 배포
2 parents 49d79e8 + c5d1318 commit 0136304

File tree

547 files changed

+25313
-291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

547 files changed

+25313
-291
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* @boostcampwm-2022/beep

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
resolved: #number
2+
3+
## 작업 내용
4+
5+
> 어떤 작업을 했는지 적어주세요!
6+
7+
## 체크리스트
8+
- [ ] Assignees 설정
9+
- [ ] Labels 설정
10+
- [ ] Projects 설정
11+
- [ ] Milestone 설정
12+
13+
## 동작 화면
14+
15+
> 존재하지 않는다면 패스해주세요!
16+
17+
## 버그
18+
19+
> 존재하지 않는다면 패스해주세요!

‎.github/labeler.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
test:
2+
- domain/src/test/**/*
3+
- presentation/src/test/**/*
4+
- presentation/src/androidTest/**/*
5+
- data/src/test/**/*
6+
7+
chore:
8+
- app/*.gradle
9+
- build.gradle
10+
- buildSrc/**/*
11+
12+
style:
13+
- presentation/src/main/res/**/*
14+
15+
feat:
16+
- app/**/*
17+
- data/src/**/*
18+
- domain/src/**/*
19+
- presentation/src/main/java/**/*
20+
21+
docs:
22+
- README.md

‎.github/workflows/beepCD.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Android CD
2+
on:
3+
pull_request:
4+
branches: [ main ]
5+
6+
jobs:
7+
build:
8+
name: Beep CD
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/checkout@v1
13+
14+
- name: set up JDK 11
15+
uses: actions/setup-java@v1
16+
with:
17+
java-version: 11
18+
19+
- name: Grant execute permission for gradlew
20+
run: chmod +x gradlew
21+
22+
- name: Create google-service
23+
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./presentation/google-services.json
24+
25+
- name: Create Local Properties
26+
run: echo '${{ secrets.LOCAL_PROPERTIES }}' > ./local.properties
27+
28+
- name: build release
29+
run: ./gradlew assembleRelease
30+
31+
- name: upload artifact to Firebase App Distribution
32+
uses: wzieba/Firebase-Distribution-Github-Action@v1
33+
34+
with:
35+
appId: ${{secrets.FIREBASE_APP_ID}}
36+
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
37+
groups: Developer
38+
file: app/build/outputs/apk/release/app-release-unsigned.apk

‎.github/workflows/beepCI.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Android CI
2+
on:
3+
pull_request:
4+
branches: [ develop ]
5+
6+
jobs:
7+
build:
8+
name: Beep CI
9+
runs-on: ubuntu-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
with:
13+
fetch-depth: 0
14+
15+
- name: Setup JDK 11
16+
uses: actions/setup-java@v3
17+
with:
18+
distribution: "zulu"
19+
java-version: 11
20+
cache: gradle
21+
22+
- name: Setup Android SDK
23+
uses: android-actions/setup-android@v2
24+
25+
- name: Grant execute permission for gradlew
26+
run: chmod +x gradlew
27+
28+
- name: Create google-service
29+
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./presentation/google-services.json
30+
31+
- name: Create Local Properties
32+
run: echo '${{ secrets.LOCAL_PROPERTIES }}' > ./local.properties
33+
34+
- name: Build with Gradle
35+
run: ./gradlew build
36+
37+
- name: Run unit tests
38+
run: ./gradlew testDebugUnitTest

‎.github/workflows/labeler.yml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
name: "Pull Request Labeler"
2+
on:
3+
pull_request_target:
4+
branches:
5+
- develop
6+
7+
jobs:
8+
label:
9+
runs-on: ubuntu-latest
10+
11+
steps:
12+
- uses: actions/labeler@v2
13+
with:
14+
repo-token: "${{ secrets.GITHUB_TOKEN }}"

‎.github/workflows/reviewKtlint.yml‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
name: ktlint
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- develop
8+
jobs:
9+
ktlint:
10+
name: Check Code Quality
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- name: Clone repo
15+
uses: actions/checkout@master
16+
with:
17+
fetch-depth: 1
18+
- name: ktlint
19+
uses: ScaCap/action-ktlint@master
20+
with:
21+
github_token: ${{ secrets.github_token }}
22+
reporter: github-pr-review
23+
android: true
24+
fail_on_error: true
25+
level: warning

‎README.md‎

Lines changed: 75 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,75 @@
1-
# android04-BEEP
1+
<h1 align="center">
2+
기프티콘, 잊지 말고 삡! 하세요 👾
3+
</h1>
4+
5+
<p align="center">
6+
7+
![Beep_Readme_Header](https://user-images.githubusercontent.com/53300830/204736853-81cc432a-cd29-461f-bc2f-e52bbdef97fb.png)
8+
9+
</p>
10+
11+
<p align="center">
12+
<img src="https://img.shields.io/github/issues/boostcampwm-2022/android04-BEEP"/>
13+
<img src="https://img.shields.io/github/issues-closed/boostcampwm-2022/android04-BEEP"/>
14+
<img src="https://img.shields.io/github/commit-activity/w/boostcampwm-2022/android04-BEEP">
15+
<img src="https://img.shields.io/github/last-commit/boostcampwm-2022/android04-BEEP">
16+
<br><br>
17+
</p>
18+
19+
## 프로젝트
20+
21+
### 소개
22+
23+
- 다양한 기프티콘을 한 곳에 모아서 관리해보세요
24+
- 기프티콘을 단순히 저장하고 보여주는 것만이 아닌 본인 위치를 기반으로 기프티콘을 추천해드려요
25+
- 보안이 걱정이 된다면! 지문인증을 활용해서 기프티콘의 바코드를 숨겨보세요
26+
27+
### 조원 소개
28+
29+
|[김명석](https://github.com/audxo112)|[박명범](https://github.com/mangbaam)|[양수진](https://github.com/yangsooplus)|[이지훈](https://github.com/lee-ji-hoon)|
30+
|------|---|---|------|
31+
|<img src="https://user-images.githubusercontent.com/53300830/203104186-2454f77f-4cab-485f-972b-22236a3d28ca.jpg" width="120" />|<img src="https://user-images.githubusercontent.com/44221447/203118314-c1a7ae71-d746-4399-bbef-2e7e71452b9c.jpg" width="120" />|<img src="https://user-images.githubusercontent.com/44221447/203118604-8b31cda6-70c9-4119-a636-0ac36b6c60a0.jpg" width="120" />|<img src="https://user-images.githubusercontent.com/53300830/203106749-8e92660f-87bd-4655-b39f-352dcc989c49.png" width="120" />|
32+
33+
## 기능 소개
34+
35+
### 홈 및 보안설정
36+
37+
|스플래시|보안 설정|홈|
38+
|:-----:|:-----:|:-----:|
39+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207079377-583d2957-6f2d-4928-b0f9-1b38d93b0615.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207080095-5eb24b14-c827-4b6f-a8b7-ab4ceca51ac4.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207086186-77eb9038-1e16-4dea-9af9-606161c3aa1f.gif" />|
40+
41+
### 지도
42+
43+
|사용 가능한 브랜드|마커 갱신|
44+
|:------:|:-----:|
45+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207081108-e8351a02-5536-426d-9030-eb87efc399d5.gif"> |<img width="200" src="https://user-images.githubusercontent.com/44221447/207081544-b7624a60-a5e5-44f4-bd7d-520a8b2b97f7.gif">|
46+
47+
### 목록
48+
49+
|목록 정렬|브랜드검색|삭제 및 사용처리|
50+
|:-----:|:-----:|:-----:|
51+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207083881-ba2cb1d0-f8b2-4891-b5d1-b78bf0fa6cf7.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207084281-5eacbcab-3d52-40b9-a5c6-b08cb2af0774.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207086841-e98b7388-5cf7-4909-a64c-733529c587c1.gif">|
52+
53+
### 기프티콘 사용 및 사용기록
54+
55+
|일반 기프티콘 사용|금액권 사용|사용 기록|
56+
|:-----:|:-----:|:-----:|
57+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207089697-90204358-eec4-4c39-a5fa-d043d66ecab0.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207089961-487b1a57-976d-4c7c-9cb0-f05c8a7e8b2f.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207090349-c0772934-867b-4014-bafb-9a7b65beb024.gif">|
58+
59+
### 기프티콘 추가
60+
61+
|자동파싱|직접파싱|
62+
|:-----:|:-----:|
63+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207082258-6805a2a0-0def-432d-b1c5-2fa91a0a3ef6.gif">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207082945-486ea598-4340-4b00-a176-62b6320abe4e.gif">|
64+
65+
### 위젯 및 알림
66+
67+
|위젯|알림|
68+
|:-----:|:-----:|
69+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207088846-ab41b231-52ae-4461-960d-bee90ef3e43f.gif" />|<img width="200" src="https://user-images.githubusercontent.com/44221447/207089143-29e855ca-c169-436c-bc8b-c19b343482b3.gif" />|
70+
71+
### 설정, 기프티콘 확인
72+
73+
|설정|사용한 기프티콘|
74+
|:-----:|:-----:|
75+
|<img width="200" src="https://user-images.githubusercontent.com/44221447/207090920-777e3638-0e02-44a3-9d2a-80f9fa01da93.png">|<img width="200" src="https://user-images.githubusercontent.com/44221447/207090806-16132558-34b6-4f7f-a6b4-c36b270a26b6.png">|

‎app/.gitignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,6 @@ captures/
7373
.externalNativeBuild
7474
.cxx/
7575

76-
# Google Services (e.g. APIs or Firebase)
77-
google-services.json
78-
7976
# Version control
8077
vcs.xml
8178

‎app/build.gradle.kts‎

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1+
import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
2+
13
plugins {
24
id("com.android.application")
35
id("org.jetbrains.kotlin.android")
6+
kotlin("kapt")
7+
id("dagger.hilt.android.plugin")
8+
id("com.google.android.gms.oss-licenses-plugin")
49
}
510

611
android {
@@ -16,6 +21,9 @@ android {
1621
versionName = AppConfig.versionName
1722

1823
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
24+
25+
buildConfigField("String", "kakaoSearchId", getApiKey("kakao_search_id"))
26+
manifestPlaceholders["naver_map_api_id"] = getApiKey("naver_map_api_id")
1927
}
2028

2129
buildTypes {
@@ -26,17 +34,32 @@ android {
2634
}
2735

2836
compileOptions {
29-
sourceCompatibility = JavaVersion.VERSION_1_8
30-
targetCompatibility = JavaVersion.VERSION_1_8
37+
sourceCompatibility = JavaVersion.VERSION_11
38+
targetCompatibility = JavaVersion.VERSION_11
3139
}
3240

3341
kotlinOptions {
34-
jvmTarget = "1.8"
42+
jvmTarget = AppConfig.jvmTarget
43+
}
44+
buildFeatures {
45+
dataBinding = true
46+
}
47+
48+
packagingOptions {
49+
resources.excludes.add("META-INF/LICENSE*")
3550
}
3651
}
3752

3853
dependencies {
3954
implementation(project(":domain"))
4055
implementation(project(":presentation"))
4156
implementation(project(":data"))
57+
implementation(platform(Libraries.FIREBASE_BOM))
58+
kapt(Kapt.APP_LIBRARIES)
59+
implementation(Libraries.APP_LIBRARIES)
60+
annotationProcessor(AnnotationProcessors.APP_LIBRARIES)
61+
}
62+
63+
fun getApiKey(propertyKey: String): String {
64+
return gradleLocalProperties(rootDir).getProperty(propertyKey)
4265
}

0 commit comments

Comments
 (0)