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

6주차 산출물입니다 #38

Merged
merged 38 commits into from
Oct 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
eaeea7c
refactor: xml 수정
todlf Oct 5, 2024
fa35f59
feat: fix bugs
settle54 Oct 5, 2024
7656b8e
Merge branch 'develop' of https://github.com/kakao-tech-campus-2nd-st…
settle54 Oct 5, 2024
a1e4a8f
Merge pull request #26 from kakao-tech-campus-2nd-step3/settle54
settle54 Oct 5, 2024
0f94c4a
style: fix margin
settle54 Oct 5, 2024
5b8cf7d
Merge pull request #27 from kakao-tech-campus-2nd-step3/settle54
settle54 Oct 5, 2024
b58caf1
feat: api/members 네트워크 처리
todlf Oct 6, 2024
0a4dcc9
style: today_log 아이콘 크기 확대
arieum Oct 7, 2024
e84e6c3
feat: 서버로부터 오늘의 일기 데이터를 가져와 리사이클러뷰에 표시
arieum Oct 7, 2024
93dedc2
fix: 날짜 이동 후 RecyclerView 데이터 갱신을 위해 notifyDataSetChanged 호출 추가
arieum Oct 7, 2024
ba22797
fix: locationRequest setWaitForAccurateLocation 설정 추가
arieum Oct 7, 2024
8e68b56
style: today_log 아이콘 크기 확대
arieum Oct 8, 2024
90c53cf
feat: 공유화면 xml 추가
arieum Oct 8, 2024
c4eb088
feat: 캘린더 날짜 TodayLogFragment로 넘겨주기
todlf Oct 9, 2024
64b92c8
Update .gitignore
todlf Oct 9, 2024
bcb85a6
feat: firebase 세팅
todlf Oct 9, 2024
345c71a
Reapply .gitignore and restore tracking for necessary files
todlf Oct 9, 2024
1863131
Update .gitignore
todlf Oct 9, 2024
2a235dd
feat: 서버로 위치정보 전달
arieum Oct 10, 2024
0614286
feat: friendsListFragment에 fab 구현
todlf Oct 10, 2024
1cb0e5e
feat: 공유화면 리사이클러뷰 구현
arieum Oct 10, 2024
b955d22
feat: 오늘의 일기화면 북마크, 공유, 삭제버튼 - 서버 전달 활성화
arieum Oct 10, 2024
bed137d
feat: 잠금화면 알림 초기
todlf Oct 11, 2024
05291e2
Merge pull request #31 from kakao-tech-campus-2nd-step3/todlf
todlf Oct 11, 2024
84d147f
feat: 카카오 로그인 백엔드 Post
todlf Oct 11, 2024
576fa8f
Merge pull request #32 from kakao-tech-campus-2nd-step3/todlf
todlf Oct 11, 2024
f1023b9
Merge branch 'weekly/6' into arieum
arieum Oct 11, 2024
8449019
Merge pull request #33 from kakao-tech-campus-2nd-step3/arieum
arieum Oct 11, 2024
986915a
style: filter bottom sheet
settle54 Oct 11, 2024
b26b1fb
Merge branch 'weekly/6' of https://github.com/kakao-tech-campus-2nd-s…
settle54 Oct 11, 2024
8d915e6
refactor: arrange kt files
settle54 Oct 11, 2024
cd244b7
feat: complete category grid
settle54 Oct 11, 2024
269a6b0
Merge pull request #34 from kakao-tech-campus-2nd-step3/settle54
settle54 Oct 11, 2024
b74d435
Merge pull request #35 from kakao-tech-campus-2nd-step3/weekly/6
settle54 Oct 11, 2024
0a9cc70
Update README.md
settle54 Oct 11, 2024
67de053
Update README.md
settle54 Oct 11, 2024
082ba7d
Merge pull request #37 from kakao-tech-campus-2nd-step3/develop
settle54 Oct 11, 2024
238a585
Update README.md
settle54 Oct 11, 2024
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
167 changes: 154 additions & 13 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,156 @@
*.iml
# Created by https://www.toptal.com/developers/gitignore/api/androidstudio,kotlin
# Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,kotlin

### Kotlin ###
# Compiled class file
*.class

# Log file
*.log

# BlueJ files
*.ctxt

# Mobile Tools for Java (J2ME)
.mtj.tmp/

# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar

# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
replay_pid*

### AndroidStudio ###
# Covers files to be ignored for android development using Android Studio.

# Built application files
*.apk
*.ap_
*.aab

# Files for the ART/Dalvik VM
*.dex

# Java class files

# Generated files
bin/
gen/
out/

# Gradle files
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
.gradle/
build/

# Signing files
.signing/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
proguard/

# Log Files

# Android Studio
/*/build/
/*/local.properties
/*/out
/*/*/build
/*/*/production
captures/
.navigation/
*.ipr
*~
*.swp

# Keystore files
*.jks
*.keystore

# Google Services (e.g. APIs or Firebase)
# google-services.json

# Android Patch
gen-external-apklibs

# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild

# NDK
obj/

# IntelliJ IDEA
*.iml
*.iws
/out/

# User-specific configurations
.idea/caches/
.idea/libraries/
.idea/shelf/
.idea/workspace.xml
.idea/tasks.xml
.idea/.name
.idea/compiler.xml
.idea/copyright/profiles_settings.xml
.idea/encodings.xml
.idea/misc.xml
.idea/modules.xml
.idea/scopes/scope_settings.xml
.idea/dictionaries
.idea/vcs.xml
.idea/jsLibraryMappings.xml
.idea/datasources.xml
.idea/dataSources.ids
.idea/sqlDataSources.xml
.idea/dynamic.xml
.idea/uiDesigner.xml
.idea/assetWizardSettings.xml
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/navEditor.xml

# Legacy Eclipse project files
.classpath
.project
.cproject
.settings/

# Mobile Tools for Java (J2ME)

# Package Files #

# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)

## Plugin-specific files:

# mpeltonen/sbt-idea plugin
.idea_modules/

# JIRA plugin
atlassian-ide-plugin.xml

# Mongo Explorer plugin
.idea/mongoSettings.xml

# Crashlytics plugin (for Android Studio and IntelliJ)
com_crashlytics_export_strings.xml
crashlytics.properties
crashlytics-build.properties
fabric.properties

### AndroidStudio Patch ###

!/gradle/wrapper/gradle-wrapper.jar

# End of https://www.toptal.com/developers/gitignore/api/androidstudio,kotlin
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

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

This file was deleted.

12 changes: 0 additions & 12 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

28 changes: 22 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,27 @@
# Team21_Android
21조 안드로이드

## 코드 리뷰 받고 싶은 부분 (개발 질문): 5주차
## 코드 리뷰 받고 싶은 부분 (개발 질문): 6주차

### todlf
[이슈 #29](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/29)
[이슈 #30](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/30)
- FCM으로 알림을 받을 때, 백그라운드에서도 remoteView를 이용한 커스텀 알림이 가능한지 궁금합니다.
- 앱이 종료되었는데 알림이 올 경우, 알림에서 이모지를 눌러서 백엔드에 데이터를 보낼 수 있는지 궁금합니다.(이모지 상호작용 알림은 포그라운드 알림에서 처리하는게 나을까요?)
- 백엔드에서 알림 API를 받아와서 FCM으로 핸드폰으로 알림을 보내주는 걸 구현하려고 하는데,
- 이 과정을 어떤 식으로 처리하는지 궁금합니다.(어떻게 해야할지 감이 안 잡힙니다 ㅠㅠ)
- #29,30 이슈 해결방법이 궁금합니다.

---

### arieum
- 이번주 PR에는 서버주소랑 jwtToken이 하드코딩되어있습니다! 다음 PR에는 추상화해서 올리겠습니다
- friend_item.xml 에서 모든 뷰들을 layout_gravity를 center로 설정해도 이미지와 텍스트뷰가 가운데정렬이 되지 않습니다. vertical_center로 설정해도 안되는데 어떻게 처리해야하는지 궁금합니다
- 5주차 코드리뷰 이제 확인해서 그부분도 다음 PR때 반영해서 올리겠습니다

---

### settle54
[이슈 #20](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/20)
[이슈 #25](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/25)
[이슈 #28](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/28)
- 이슈 20, 이슈25, 이슈28에 대한 해결방법을 알고 싶습니다.
- 불필요하거나 비효율적인 코드가 있으면 개선받고 싶습니다! (카테고리를 추가하는 코드가 많이 스파게티가 된 것 같습니다...)
[이슈 #36](https://github.com/kakao-tech-campus-2nd-step3/Team21_Android/issues/36)
- 이슈 36에 대한 해결방법을 알고 싶습니다.
- 불필요하거나 비효율적인 코드가 있으면 개선받고 싶습니다!
3 changes: 2 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/build
/build
google-services.json
6 changes: 6 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import java.util.Properties
plugins {
alias(libs.plugins.androidApplication)
alias(libs.plugins.jetbrainsKotlinAndroid)
id("com.google.gms.google-services")
}

fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)
Expand Down Expand Up @@ -65,11 +66,16 @@ dependencies {
implementation(libs.okhttp)
implementation(libs.play.services.location)
implementation(libs.androidx.work.runtime.ktx)
implementation ("androidx.lifecycle:lifecycle-viewmodel-ktx:2.8.6")
implementation("com.github.prolificinteractive:material-calendarview:2.0.1")
implementation ("com.jakewharton.threetenabp:threetenabp:1.2.1")
implementation ("com.google.android.material:material:1.2.0")
implementation ("com.kakao.sdk:v2-all:2.20.6")
implementation ("com.kakao.sdk:v2-user:2.20.6")
implementation(platform("com.google.firebase:firebase-bom:33.1.2"))
implementation("com.google.firebase:firebase-analytics-ktx")
implementation("com.google.firebase:firebase-config-ktx:22.0.0")
implementation("com.google.firebase:firebase-messaging-ktx:24.0.0")
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand Down
34 changes: 29 additions & 5 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,32 @@
android:supportsRtl="true"
android:theme="@style/Theme.Everymoment"
tools:targetApi="31">
<receiver
android:name=".NotificationActionReceiver"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="HAPPY_ACTION" />
<action android:name="SAD_ACTION" />
<action android:name="INSENSITIVE_ACTION" />
<action android:name="ANGRY_ACTION" />
<action android:name="CONFOUNDED_ACTION" />
</intent-filter>
</receiver>

<service
android:name=".fcm.MyFirebaseMessagingService"
android:enabled="true"
android:exported="false">
<intent-filter>
<action android:name="com.google.firebase.MESSAGING_EVENT" />
</intent-filter>
</service>

<activity
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
android:exported="true">
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand All @@ -37,11 +59,13 @@
</intent-filter>
</activity>
<activity
android:name=".presentation.view.KakaoLoginActivity"
android:exported="false" />
android:name=".presentation.view.main.KakaoLoginActivity"
android:exported="false"
android:screenOrientation="portrait" />
<activity
android:name=".presentation.view.MainActivity"
android:exported="true">
android:name=".presentation.view.main.MainActivity"
android:exported="true"
android:screenOrientation="portrait">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
package com.example.everymoment

import android.app.Application
import com.example.everymoment.data.model.PreferenceUtil
import com.kakao.sdk.common.KakaoSdk

class GlobalApplication : Application() {
companion object {
lateinit var prefs: PreferenceUtil
}
override fun onCreate() {
super.onCreate()
KakaoSdk.init(this, "${BuildConfig.KAKAO_NATIVE_KEY}")
prefs = PreferenceUtil(applicationContext)
}
Comment on lines +8 to 15

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

application 클래스에서 PreferenceUtil을 초기화하고, 이걸 매번 가져다 사용할 수 있겠지만, 아직 프로젝트 초반이니 Hilt를 적용해서 의존성 주입을 받을 수 있도록 구성하는걸 추천드립니다.

}
Loading