Skip to content

Commit

Permalink
[PRODUCTION] Version 1.2(21)
Browse files Browse the repository at this point in the history
[PRODUCTION] Version 1.2(21)
  • Loading branch information
kkk5474096 authored Sep 1, 2023
2 parents 15a3830 + 65fbb36 commit 9c02b47
Show file tree
Hide file tree
Showing 643 changed files with 32,459 additions and 95 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# YELL:O Android Team
* @team-yello/andro-d
2 changes: 2 additions & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
addReviewers: false
addAssignees: author
85 changes: 85 additions & 0 deletions .github/workflows/debug_builder.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
name: YELLO Push Builder

on:
push:
branches: [ develop, production ]

defaults:
run:
shell: bash
working-directory: .

jobs:
build:
name: APK Builder When Push
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Gradle cache
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: set up JDK 17
uses: actions/setup-java@v1
with:
java-version: 17

- name: Change gradlew permissions
run: chmod +x ./gradlew

- name: Create Local Properties
run: touch local.properties

- name: Access Local Properties
env:
base_url: ${{ secrets.BASE_URL }}
native_app_key: ${{ secrets.NATIVE_APP_KEY }}
test_base_url: ${{ secrets.TEST_BASE_URL }}
test_native_app_key: ${{ secrets.TEST_NATIVE_APP_KEY }}
amplitude_api_key: ${{ secrets.AMPLITUDE_API_KEY }}
amplitude_api_test_key: ${{ secrets.AMPLITUDE_API_TEST_KEY }}
run: |
echo base.url=\"$base_url\" >> local.properties
echo native.app.key=\"$native_app_key\" >> local.properties
echo nativeAppKey=$native_app_key >> local.properties
echo test.base.url=\"$test_base_url\" >> local.properties
echo test.native.app.key=\"$test_native_app_key\" >> local.properties
echo testNativeAppKey=$test_native_app_key >> local.properties
echo amplitude.api.key=$amplitude_api_key >> local.properties
echo amplitude.api.test.key=$amplitude_api_test_key >> local.properties
- name: Access Firebase Service
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

- name: Build debug APK
run: ./gradlew assembleDebug --stacktrace

- name: On Success
if: ${{ success() }}
uses: MeilCli/slack-upload-file@v1
with:
slack_token: ${{ secrets.SLACK_BOT_TOKEN}}
channels: ${{ secrets.SLACK_CHANNEL_ID }}
file_path: 'app/build/outputs/apk/debug/app-debug.apk'
file_name: 'YELLO.apk'
file_type: 'apk'
initial_comment: '🎉 YELLO가 슬랙으로 들어왔습니다'

- name: On Failed, Notify in Slack
if: ${{ failure() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: '#ff0000'
SLACK_ICON: https://avatars.githubusercontent.com/u/137089215?s=48&v=4
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_TITLE: 'YELLO/Android Debug build Fail❌'
MSG_MINIMAL: true
SLACK_USERNAME: YELLO_ANDROID
SLACK_MESSAGE: 'APK 생성 중 에러가 발생했습니다. 에러를 확인해주세요'
90 changes: 90 additions & 0 deletions .github/workflows/pr_checker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: YELLO PR Checker

on:
pull_request:
branches: [ develop, production ]

defaults:
run:
shell: bash
working-directory: .

jobs:
build:
name: PR Checker
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Gradle cache
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'temurin'
java-version: 17

- name: Change gradlew permissions
run: chmod +x ./gradlew

- name: Create Local Properties
run: touch local.properties

- name: Access Firebase Service
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

- name: Access Local Properties
env:
base_url: ${{ secrets.BASE_URL }}
native_app_key: ${{ secrets.NATIVE_APP_KEY }}
test_base_url: ${{ secrets.TEST_BASE_URL }}
test_native_app_key: ${{ secrets.TEST_NATIVE_APP_KEY }}
amplitude_api_key: ${{ secrets.AMPLITUDE_API_KEY }}
amplitude_api_test_key: ${{ secrets.AMPLITUDE_API_TEST_KEY }}
run: |
echo base.url=\"$base_url\" >> local.properties
echo native.app.key=\"$native_app_key\" >> local.properties
echo nativeAppKey=$native_app_key >> local.properties
echo test.base.url=\"$test_base_url\" >> local.properties
echo test.native.app.key=\"$test_native_app_key\" >> local.properties
echo testNativeAppKey=$test_native_app_key >> local.properties
echo amplitude.api.key=$amplitude_api_key >> local.properties
echo amplitude.api.test.key=$amplitude_api_test_key >> local.properties
- name: Access Firebase Service
run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ./app/google-services.json

- name: Build debug APK
run: ./gradlew assembleDebug --stacktrace

- name: On Success
if: ${{ success() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: '#53A551'
SLACK_ICON: https://avatars.githubusercontent.com/u/137089215?s=48&v=4
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_TITLE: 'YELLO/PR Check S.U.C.C.E.S.S 🎉🎉🎉'
MSG_MINIMAL: true
SLACK_USERNAME: YELLO_ANDROID
SLACK_MESSAGE: 'P R 성 공!!! 🎉🎉🎉 조와~쒀'

- name: On Failed, Notify in Slack
if: ${{ failure() }}
uses: rtCamp/action-slack-notify@v2
env:
SLACK_COLOR: '#ff0000'
SLACK_ICON: https://avatars.githubusercontent.com/u/137089215?s=48&v=4
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
SLACK_TITLE: 'YELLO/Android Debug build Fail❌'
MSG_MINIMAL: true
SLACK_USERNAME: YELLO_ANDROID
SLACK_MESSAGE: '에러ㅋㅋㅋㅋㅋ났네ㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋㅋ'
113 changes: 111 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,111 @@
# YELLO-Android
:P
# YELL:O
<p align="center"><img src="https://github.com/team-yello/YELLO-Android/assets/70993562/96e4be19-e35f-479d-8354-8ef83f005b76" height=280></p>

```
투표로 관계의 재미를 찾아가는 서비스, YELL:O
```
<br>

## CONTRIBUTORS
| 이강민<br/>([@kkk5474096](https://github.com/kkk5474096)) | 전채연<br/>([@b1urrrr](https://github.com/b1urrrr)) | 김상호<br/>([@Marchbreeze](https://github.com/Marchbreeze)) | 박민주<br/>([@minju1459](https://github.com/minju1459)) |
|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
| <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/76741702/d197584e-394c-415c-a86a-0d7515315c02"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/76741702/120c0877-a84b-40d9-8185-78aa03d866b8"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/76741702/c42f8a50-3d29-4c1f-bcad-7f2a2ce4f8b1"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/76741702/8c36ce54-4803-4c4f-b318-6887953e54a6"/> |
| `내 쪽지`<br/>`푸시알림` | `투표(옐로하기)` | `프로필`<br/>`추천친구` <br/>`타임라인` <br/>`인앱결제` | `온보딩` <br/>`튜토리얼` |
<br>

## TECH STACK
- Android App Architecture
- Multi-Module
- Hilt
- Coroutine
- Paging3
- Data Binding
- Timber, Coil, Lottie, Shimmer
- Firebase Cloud Messaging
- Kakao Open API
- Google Play Billing API (in-app purchases API)
<br>

## SCREENSHOTS
|| 1 | 2 | 3 | 4 |
|:-------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------------------------:|
| 스플래쉬 <br> 로그인 | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/ce2916a1-d2ac-4d6e-9d83-01bf1d6a287d"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/b3e9cfb5-c9e3-473e-acbd-f9a17234887b"/> | | |
| 온보딩 <br> 튜토리얼 | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/68b6b390-4a98-4372-8cab-524df53a97d6"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/4492a57b-e536-4fb0-b6f0-c6c653ef7588"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/8c70cef1-887d-45a1-8dd4-3f6646df687e"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/9cacf1be-f920-4976-b2da-24a8e33eba7f"/> |
| 투표 (옐로하기) | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/bf2a6b53-53f2-4e48-8ad2-fdb8faf569c5"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/e1b0395a-44c2-4563-ba91-a2a037939595"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/04c43634-ccf0-4e62-b61a-e98eefa61d84"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/72be3901-8736-4d9d-b482-474d755fe6b4"/> |
| 내 쪽지 <br> 결제 | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/6680eb1a-24ab-4fcd-978d-7edfe85ef7eb"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/dbea7358-719b-4655-a82b-5de967ada176"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/437553f5-646d-402a-add5-0d8d795b2bdd"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/cbd01fed-2ced-4547-b599-6ec97447c0dc"/> |
| 추천친구 | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/8a45cfc7-b04b-4a46-8be7-c4a7979413a4"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/28e16d1c-9faa-48ed-a1f4-efbc367ee891"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/215c0e3e-f8da-4771-ac29-b8bcd5728bc6"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/2627ecb0-4325-4cbc-91be-e5b799557ef0"/> |
| 타임라인 <br> 프로필 | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/2aaf58fb-1f65-4fb0-a3c8-5fc6b18ef20e"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/23b73f80-df55-405f-963a-1d9f61771d57"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/723f372d-1431-4b75-8c80-b63664a4176c"/> | <img width="200px" src="https://github.com/team-yello/YELLO-Android/assets/97405341/de797eef-6aab-4c5a-9e50-a6adabb014f2"/> |
<br>

## COMMON TYPE
- ✨ **[FEAT]** : 새로운 기능 구현
- ✅ **[MOD]** : 코드 수정 및 내부 파일 수정
- ➕ **[ADD]** : 부수적인 코드 추가 및 라이브러리 추가, 새로운 파일 생성
- 🎀 **[CHORE]** : 버전 코드 수정, 패키지 구조 변경, 타입 및 변수명 변경 등의 작은 작업
- ⚰️ **[DEL]** : 쓸모없는 코드나 파일 삭제
- 💄 **[UI]** : UI 작업
- 🔨 **[FIX]** : 버그 및 오류 해결
- 🚑️ **[HOTFIX]** : issue나 QA에서 문의된 급한 버그 및 오류 해결
- 🔀 **[MERGE]** : 다른 브랜치와의 MERGE
- 🚚 **[MOVE]** : 프로젝트 내 파일이나 코드의 이동
- ⏪️ **[RENAME]** : 파일 이름 변경
- ♻️ **[REFACTOR]** : 전면 수정
- 📝 **[DOCS]** : README나 WIKI 등의 문서 개정
<br>

## [COMMIT CONVENTION](https://www.notion.so/yell0/Github-Convention-daa23c4e64ad4e0b9cb5f720f4694732?pvs=4#a41dad6a57ae4dacb85d271163f82128)
```
[커밋유형/#이슈번호] 작업내용
```
<br>

## [BRANCH CONVENTION](https://www.notion.so/yell0/Branch-Convention-1881bd8691654b0cbeba3ef3f94c7cdb)
```
브랜치유형/#이슈번호-작업내용
```
<br>

## [ISSUE CONVENTION](https://www.notion.so/yell0/Github-Convention-daa23c4e64ad4e0b9cb5f720f4694732?pvs=4#e338546983c1443d8d65af3c33613ce4)
```
[작업유형] 뷰이름 / 작업내용
```
<br>

## [PR CONVENTION](https://www.notion.so/yell0/Github-Convention-daa23c4e64ad4e0b9cb5f720f4694732?pvs=4#d94cc0666b754b73967f95ea7810bd72)
```
[작업유형/#이슈번호] 뷰이름 / 작업내용
```
<br>

## [CODING CONVENTION](https://yell0.notion.site/a1d166eeeee04dddb31fd6f1d224a46a?v=0ecae9f587064ce4880cc32063ae7dbe&pvs=4)
- [Kotlin 공식 컨벤션](https://kotlinlang.org/docs/coding-conventions.html) 준수
<br>

## [MODULE & PACKAGE CONVENTION]()
```
🗃️app
┣ 📂di
┣ 📂presentation
🗃️buildSrc
🗃️core-ui
┣ 📂base
┣ 📂context
┣ 📂fragment
┣ 📂intent
┣ 📂view
🗃️data
┣ 📂datasource
┣ 📂local
┣ 📂model
┃ ┣ 📂response
┃ ┣ 📂request
┣ 📂repository
┣ 📂remote
┃ ┣ 📂interceptor
┃ ┣ 📂service
┣ 📂util
🗃️domain
┣ 📂entity
┣ 📂repository
```
<br>
44 changes: 0 additions & 44 deletions app/build.gradle

This file was deleted.

Loading

0 comments on commit 9c02b47

Please sign in to comment.