Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V1.0.0 Main 브랜치 반영 #73

Merged
merged 68 commits into from
Sep 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
0206ae4
[BASE] #1 프로젝트 기본 작업 세팅 (#2)
jiwon2724 Jun 17, 2024
1dc3731
[BASE] #3 디자인 시스템 모듈 생성
l5x5l Jun 23, 2024
960c8df
[BASE] #3 폰트 파일 추가
l5x5l Jun 23, 2024
debb371
[FEAT] #3 색상, 글꼴 디자인 시스템 적용한 PokitTheme 구현
l5x5l Jun 23, 2024
3236d7e
[BASE] #3 figma에 존재하는 아이콘 svg파일 추가
l5x5l Jun 23, 2024
8246ef2
[FEAT] #3 디자인 시스템 버튼 구현
l5x5l Jun 23, 2024
c55b8dc
[FEAT] #3 디자인 시스템 Input 구현
l5x5l Jun 24, 2024
8df894c
[FEAT] #3 디자인 시스템 LinkCard 구현
l5x5l Jun 25, 2024
6890e8b
[FEAT] #3 디자인 시스템 CategoryCard 구현
l5x5l Jun 25, 2024
ce0b258
[FEAT] #3 디자인 시스템 textInput 구현 - 네이밍을 LabeledInput으로 변경
l5x5l Jun 25, 2024
786dca8
[FEAT] #3 디자인 시스템 textArea 구현 - 네이밍을 PokitInputArea로 변경
l5x5l Jun 25, 2024
5de91d6
[FEAT] #3 누락된 inputAreaState enum class 추가
l5x5l Jun 26, 2024
f0e0d1f
[FEAT] #3 디자인 시스템 select 구현
l5x5l Jun 26, 2024
ee70461
[FEAT] #3 디자인 시스템 아이콘 리소스 추가
l5x5l Jun 28, 2024
422c383
[FEAT] #3 디자인 시스템 chip 구현
l5x5l Jun 28, 2024
1cf26fb
[FEAT] #3 디자인 시스템 chip 구현 (누락된 attributes 추가)
l5x5l Jun 28, 2024
43f2761
[FEAT] #3 디자인 시스템 checkbox 구현
l5x5l Jun 28, 2024
86bf1d8
[FEAT] #3 디자인 시스템 radioSwitch 구현
l5x5l Jun 28, 2024
3da0a38
[FEAT] #3 디자인 시스템 input 관련 component 리펙토링
l5x5l Jun 30, 2024
0e62196
[REFACTOR] #3 디자인 시스템 button component 리펙토링
l5x5l Jun 30, 2024
60fbc3b
[REFACTOR] #3 디자인 시스템 component preview를 별도의 파일로 분리
l5x5l Jun 30, 2024
98d870c
[FEAT] #3 디자인 시스템 tap 구현
l5x5l Jun 30, 2024
6effbd0
[CHORE] #3 ktlink 규칙에 맞게 코드 수정
l5x5l Jun 30, 2024
9f97e3e
[CHORE] #3 디자인 시스템 BottomSheet 구현
l5x5l Jun 30, 2024
817eec3
[CHORE] #3 ./gradlew ktlintFormat 적용
l5x5l Jun 30, 2024
fffb2d6
[REFACTOR] #3 디자인 시스템 select component 리펙토링
l5x5l Jun 30, 2024
d831df1
[CHORE] #3 when문이 하나의 값을 기준으로 케이스를 구분하고 있으면서, 코드블록에 로직이 없는 경우 한 라인으로 …
l5x5l Jun 30, 2024
40167bb
[CHORE] #3 pokitButtonContainerModifier의 padding 설정 메서드 중 중복되는 부분 분리 …
l5x5l Jun 30, 2024
f26be0f
Merge pull request #5 from YAPP-Github/base/#3-setting-design_system
l5x5l Jun 30, 2024
42ea40d
[FEATURE] #4 SNS 로그인 구현 (#6)
jiwon2724 Jul 2, 2024
8d8b421
[Base] #10 디자인 시스템 수정 및 추가구현 (#11)
l5x5l Jul 8, 2024
f3fca54
[FEATURE] #9 링크 추가하기 화면 구현 (#12)
l5x5l Jul 14, 2024
8074bf3
[Feature] #13 포킷 추가 화면 구현 (#15)
l5x5l Jul 14, 2024
38d8ceb
[CHORE] #13 settings.gradle에 feature:addpokit 모듈 추가
l5x5l Jul 14, 2024
7ac909c
[Base] #14 디자인 시스템 수정 및 추가구현 (#17)
l5x5l Jul 16, 2024
4b08545
[FIX] #14 ModifyBottomSheetContent 에서 공유 버튼 클릭 이벤트가 연결되지 않던 문제 수정
l5x5l Jul 16, 2024
0329fc6
[UI] #8 회원가입, 로그인 프로세스 화면 구현 (#18)
jiwon2724 Jul 17, 2024
ba6b1d7
[UI] #16 포킷 상세 화면 구현 (#20)
l5x5l Jul 19, 2024
b86eadc
[Feature] #21 검색 화면 구현 (#23)
l5x5l Jul 27, 2024
a68735a
[chore] ktlint rule 추가
jiwon2724 Jul 29, 2024
5458359
[BASE] #22 Hilt 모듈 구현 (#24)
jiwon2724 Jul 30, 2024
d97a9e3
[Base] #26 디자인 시스템-BottomSheet 추가 및 수정 (#27)
l5x5l Jul 30, 2024
8b16632
[Base] #25 app navigation 구현 (#30)
l5x5l Aug 3, 2024
b6272e9
[FEATURE] #29 로그인 프로세스 api 연동 (#31)
jiwon2724 Aug 4, 2024
eb85794
[FEATURE] #7 설정화면 구현 (#33)
jiwon2724 Aug 6, 2024
7c8a411
[Feature] #32 포킷 상세 및 포킷 추가/수정화면 API 연결 (#35)
l5x5l Aug 11, 2024
e58e42f
[Feature]#36 링크 관련 API 구현 및 링크 추가/수정 화면, 검색 화면에 연결 (#37)
l5x5l Aug 16, 2024
a65cc3a
[FEATURE] #19 Home화면 UI 구현 및 API 연동 (#38)
jiwon2724 Aug 17, 2024
4fada09
[Feature] #34 알림 화면 구현 (#40)
l5x5l Aug 18, 2024
50d7f32
[UI] #41 8월 22일자 디자인 QA 적용 (#42)
l5x5l Aug 24, 2024
c8db630
[UI[ #28 스플래쉬 및 로그인 UI 수정 (#43)
jiwon2724 Aug 24, 2024
06cfdda
[chore] 메인화며 로직 수정
jiwon2724 Aug 24, 2024
4e05841
[Fix] hackerton ysh (#45)
l5x5l Aug 24, 2024
9117a2f
[FEATURE] #44 토큰 인터셉트, 리프레쉬 구현 (#46)
jiwon2724 Aug 24, 2024
bc063ac
[feature] isRegistered에 따른 로직 분기 구현 (#49)
jiwon2724 Aug 24, 2024
47204d8
[FEATURE] #48 hackerton (#51)
jiwon2724 Aug 25, 2024
d4d11c1
[UI] #47 세부 UI 수정 (#50)
l5x5l Aug 25, 2024
439b4ab
[FEATURE] #52 로그인 바텀시트 렌더링 (#53)
jiwon2724 Aug 25, 2024
4b55225
[FIX] #54-링크 클릭시 웹 브라우저 호출 로직 구현 (#55)
l5x5l Aug 25, 2024
d768d42
[feature] 설정화면 뒤로가기 구현
jiwon2724 Aug 25, 2024
a381f6a
[Fix] #56 세부사항 수정 (#57)
l5x5l Aug 25, 2024
7d9d0fc
[Fix] #58 메인 화면 QA 진행 (#60)
l5x5l Aug 28, 2024
1275367
[FIX] #59 20240828 QA (#62)
jiwon2724 Aug 28, 2024
e297184
[Fix] #61 qa add pokit link (#63)
l5x5l Aug 29, 2024
39b6e7a
[Fix] #64 qa link detail (#66)
l5x5l Aug 30, 2024
b45db2c
[Fix] #67 qa bottom sheet (#68)
l5x5l Aug 31, 2024
13d61ad
[Fix]#69 1차 배포 전 QA 사항 반영 (#70)
l5x5l Sep 6, 2024
e79a730
[CHORE] 버젼 코드 수정
l5x5l Sep 15, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
root = true

[*]
max_line_length = 160

[*.{kt,kts}]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_style = space
trim_trailing_whitespace = true
insert_final_newline = true
tab_width = 4
ij_kotlin_allow_trailing_comma = true
14 changes: 14 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-생성.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---
name: Issue 생성
about: 여러 타입의 이슈를 생성합니다.
title: "[FEATURE CHORE BUG HOTFIX BASE UI] 이슈 제목"
labels: ''
assignees: ''

---

## 내용
작업 내용을 요약해주세요.
## Todo
- [ ] todo1
- [ ] todo2
29 changes: 29 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
## Key Changes
<!---- 변경 사항, 개발 및 관련 이슈에 대해 간단하게 작성해주세요. -->
Resolves: #(Isuue Number)

## PR 유형
어떤 변경 사항이 있나요?
- [ ] 새로운 기능 추가
- [ ] 버그 수정
- [ ] CSS 등 사용자 UI 디자인 변경
- [ ] 코드에 영향을 주지 않는 변경사항(오타 수정, 탭 사이즈 변경, 변수명 변경)
- [ ] 코드 리팩토링
- [ ] 주석 추가 및 수정
- [ ] 문서 수정
- [ ] 테스트 추가, 테스트 리팩토링
- [ ] 빌드 부분 혹은 패키지 매니저 수정
- [ ] 파일 혹은 폴더명 수정
- [ ] 파일 혹은 폴더 삭제

## To Reviewers
- 리뷰어에게 중점적으로 확인받고 싶은 내용을 알려주세요.

## PR Checklist
PR이 다음 요구 사항을 충족하는지 확인하세요.
- [ ] 커밋 메시지 컨벤션에 맞게 작성했습니다.
- [ ] 정해진 코딩 컨벤션에 맞게 작성했습니다.
- [ ] 변경 사항에 대한 테스트를 했습니다.(버그 수정/기능에 대한 테스트)

## Etc.
<!---- 그 외 기타 등등 사항(리뷰어가 알아야하는 등등)을 기록해주세요. -->
37 changes: 37 additions & 0 deletions .github/workflows/ktlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Android CI

on:
push:
branches: [ "develop" ]
pull_request:
branches: [ "develop" ]

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: check out repository
uses: actions/checkout@v3

- name: set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
cache: gradle

- name: check google client id
env:
GOOGLE_CLIENT_ID: ${{secrets.GOOGLE_CLIENT_ID}}
run: |
echo web_client_id=\""$GOOGLE_CLIENT_ID"\" >> local.properties

- name: Run ktlint
run: ./gradlew ktlintCheck

- name: Run unit tests
run: ./gradlew testDebugUnitTest

- name: Build with Gradle
run: ./gradlew assembleDebug
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
/captures
.externalNativeBuild
.cxx
local.properties
app/google-services.json
12 changes: 12 additions & 0 deletions .idea/deploymentTargetDropDown.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
/build
/build
/local.properties
google-services.json
45 changes: 39 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
alias(libs.plugins.com.android.application)
alias(libs.plugins.org.jetbrains.kotlin.android)
alias(libs.plugins.hilt)
alias(libs.plugins.googleServices)
alias(libs.plugins.kotlin.parcelize)
id("kotlin-kapt")
}

android {
Expand All @@ -11,8 +15,8 @@ android {
applicationId = "pokitmons.pokit"
minSdk = 24
targetSdk = 34
versionCode = 1
versionName = "1.0"
versionCode = 2
versionName = "1.0.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
Expand Down Expand Up @@ -50,7 +54,6 @@ android {
}

dependencies {

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
Expand All @@ -66,4 +69,34 @@ dependencies {
androidTestImplementation(libs.androidx.ui.test.junit4)
debugImplementation(libs.androidx.ui.tooling)
debugImplementation(libs.androidx.ui.test.manifest)
}

implementation(project(":core:ui"))
implementation(project(":core:feature"))
implementation(project(":data"))
implementation(project(":domain"))
implementation(project(":feature:addlink"))
implementation(project(":feature:addpokit"))
implementation(project(":feature:alarm"))
implementation(project(":feature:login"))
implementation(project(":feature:pokitdetail"))
implementation(project(":feature:search"))
implementation(project(":feature:settings"))
implementation(project(":feature:home"))

// hilt
implementation(libs.hilt)
kapt(libs.hilt.compiler)

// firebase
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.auth.ktx)

// navigation
implementation(libs.androidx.navigation.compose)
implementation(libs.hilt.navigation.compose)

// orbit
implementation(libs.orbit.compose)
implementation(libs.orbit.core)
implementation(libs.orbit.viewmodel)
}
62 changes: 62 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"project_info": {
"project_number": "217769178527",
"project_id": "pokit-f5c83",
"storage_bucket": "pokit-f5c83.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:217769178527:android:5d7efa4ceafe61c37af9aa",
"android_client_info": {
"package_name": "pokitmons.pokit"
}
},
"oauth_client": [
{
"client_id": "217769178527-jaa8p8nfmic1j1065qs5a7vfqt18qec0.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "pokitmons.pokit",
"certificate_hash": "9ded6dcd446add68f506001f3c1b457cc1c3be9e"
}
},
{
"client_id": "217769178527-mmbheg9v5npdhdrbfq78slpsk8lt2nga.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "pokitmons.pokit",
"certificate_hash": "b2f3e34f8e02d15beb0d10d3d48a05148e943642"
}
},
{
"client_id": "217769178527-tslgsrrr1o8bli4hr4qnas2u9kg80a9h.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyDMh93QvJGUUX8-E-wyJoSS3cFrwfw8Q3w"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "217769178527-l4prj2q9qsuvkodc2cpi84psvul5rth2.apps.googleusercontent.com",
"client_type": 3
},
{
"client_id": "217769178527-021j3dpbues9rhbkp6cffnn19mdajorq.apps.googleusercontent.com",
"client_type": 2,
"ios_info": {
"bundle_id": "com.pokitmons.pokit.App"
}
}
]
}
}
}
],
"configuration_version": "1"
}
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
package pokitmons.pokit

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.platform.app.InstrumentationRegistry
import junit.framework.TestCase.assertEquals
import org.junit.Test
import org.junit.runner.RunWith

import org.junit.Assert.*

/**
* Instrumented test, which will execute on an Android device.
*
Expand All @@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
val appContext = InstrumentationRegistry.getInstrumentation().targetContext
assertEquals("pokitmons.pokit", appContext.packageName)
}
}
}
12 changes: 8 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,24 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:name=".PokitApplication"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_launcher_pooki"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_launcher_pooki_round"
android:supportsRtl="true"
android:theme="@style/Theme.Pokit"
tools:targetApi="31">
tools:targetApi="34">
<activity
android:screenOrientation="portrait"
android:name=".MainActivity"
android:exported="true"
android:label="@string/app_name"
android:windowSoftInputMode="adjustResize"
android:theme="@style/Theme.Pokit">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Binary file added app/src/main/ic_launcher_pooki-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading