Merge branch 'develop_back_core' into feat/group_accept_B-#414

tukcomCD2024 · May 14, 2024 · 1ec519a · 1ec519a
2 parents bfeeacb + 370bbd2
commit 1ec519a
Show file tree

Hide file tree

Showing 334 changed files with 13,474 additions and 1,122 deletions.
diff --git a/frontend/ARchive/app/build.gradle b/frontend/ARchive/app/build.gradle
@@ -6,6 +6,7 @@ plugins {
     id 'dagger.hilt.android.plugin'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
+    id 'com.google.android.gms.oss-licenses-plugin'
 }
 
 Properties properties = new Properties()
@@ -141,7 +142,7 @@ dependencies {
     implementation 'com.google.android.gms:play-services-auth:20.7.0'
 
     //네이버 지도 : https://navermaps.github.io/android-map-sdk/guide-ko/1.html
-    implementation 'com.naver.maps:map-sdk:3.17.0'
+    implementation 'com.naver.maps:map-sdk:3.18.0'
 
     // Jetpack Security
     implementation 'androidx.security:security-crypto-ktx:1.1.0-alpha06'
@@ -178,6 +179,16 @@ dependencies {
 
     // Event Bus : https://github.com/greenrobot/EventBus
     implementation("org.greenrobot:eventbus:3.3.1")
+
+    // oss-licenses : https://github.com/google/play-services-plugins/tree/master/oss-licenses-plugin
+    implementation 'com.google.android.gms:play-services-oss-licenses:17.0.1'
+
+    // Swiperefreshlayout: https://developer.android.com/jetpack/androidx/releases/swiperefreshlayout?hl=ko#kts
+    implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0")
+
+    // ConcatAdapter
+    implementation "androidx.recyclerview:recyclerview:1.3.2"
+
 }
 kapt {
     correctErrorTypes true

diff --git a/frontend/ARchive/app/src/main/AndroidManifest.xml b/frontend/ARchive/app/src/main/AndroidManifest.xml
@@ -7,6 +7,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.CAMERA" /> <!-- Sceneform requires OpenGL ES 3.0 or later. -->
     <uses-permission android:name="android.permission.READ_CONTACTS" />
+    <uses-permission android:name="android.permission.READ_PHONE_NUMBERS" />
     <uses-permission
         android:name="android.permission.POST_NOTIFICATIONS"
         android:minSdkVersion="33" />
@@ -24,16 +25,41 @@
         android:allowBackup="false"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="false"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/app_symbol"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/app_symbol"
         android:screenOrientation="portrait"
         android:supportsRtl="true"
         android:theme="@style/Theme.ARchive"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+        <activity
+            android:name=".presentation.ui.mypage.friend.addgroup.AddGroupActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.ui.mypage.friendaccept.FriendAcceptActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.ui.mypage.friend.addfriend.AddFriendActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.ui.mypage.friend.FriendActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.ui.home.notification.NotificationActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.ui.mypage.setting.SettingActivity"
+            android:screenOrientation="portrait"
+            android:exported="false" />
         <activity
             android:name=".presentation.ui.ErrorActivity"
+            android:screenOrientation="portrait"
             android:exported="false" />
         <activity
             android:name=".presentation.ui.permission.PermissionActivity"
@@ -82,10 +108,9 @@
         <activity
             android:name=".presentation.ui.MainActivity"
             android:exported="true"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait"
-            tools:ignore="LockedOrientationActivity"
-            android:launchMode="singleTask">
-        </activity>
+            tools:ignore="LockedOrientationActivity" />
         <activity
             android:name=".presentation.ui.auth.AuthActivity"
             android:screenOrientation="portrait"
@@ -102,13 +127,22 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light" />
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+            android:screenOrientation="portrait"
+            android:theme="@style/Theme.AppCompat.Light" />
 
         <meta-data
             android:name="com.google.firebase.messaging.default_notification_icon"
             android:resource="@drawable/app_symbol" />
-        <!-- Set color used with incoming notification messages. This is used when no color is set for the incoming
-             notification message. See README(https://goo.gl/6BKBk7) for more. -->
-
+        <!--
+ Set color used with incoming notification messages. This is used when no color is set for the incoming
+             notification message. See README(https://goo.gl/6BKBk7) for more.
+        -->
         <meta-data
             android:name="com.google.android.ar.API_KEY"
             android:value="${GOOGLE_APP_KEY}" />
@@ -138,7 +172,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-
     </application>
 
 </manifest>
diff --git a/.../main/java/com/droidblossom/archive/data/dto/capsule/response/NearbyCapsuleResponseDto.kt b/.../main/java/com/droidblossom/archive/data/dto/capsule/response/NearbyCapsuleResponseDto.kt
@@ -1,12 +1,16 @@
 package com.droidblossom.archive.data.dto.capsule.response
 
 import com.droidblossom.archive.data.dto.common.CapsuleSummaryDto
-import com.droidblossom.archive.domain.model.capsule.NearbyCapsule
+import com.droidblossom.archive.domain.model.capsule.CapsuleAnchors
+import com.droidblossom.archive.domain.model.capsule.CapsuleMarkers
 
 data class NearbyCapsuleResponseDto (
     val capsules : List<CapsuleSummaryDto>
 ){
-    fun toModel() = NearbyCapsule(
-        capsules = this.capsules.map { it.toModel() }
+    fun toMarkerModel() = CapsuleMarkers(
+        capsuleMarkers = this.capsules.map { it.toMarkerModel() }
+    )
+    fun toAnchorModel() = CapsuleAnchors(
+        capsuleAnchors = this.capsules.map { it.toAnchorModel() }
     )
 }
diff --git a/...java/com/droidblossom/archive/data/dto/capsule_skin/request/CapsuleSkinsPageRequestDto.kt b/...java/com/droidblossom/archive/data/dto/capsule_skin/request/CapsuleSkinsPageRequestDto.kt
diff --git a/.../request/SecretCapsuleCreateRequestDto.kt → ...ata/dto/common/CapsuleCreateRequestDto.kt b/.../request/SecretCapsuleCreateRequestDto.kt → ...ata/dto/common/CapsuleCreateRequestDto.kt
@@ -1,9 +1,8 @@
-package com.droidblossom.archive.data.dto.secret.request
+package com.droidblossom.archive.data.dto.common
 
 import com.droidblossom.archive.data.dto.capsule.response.AddressDataDto
-import com.droidblossom.archive.data.dto.common.FileNameDto
 
-data class SecretCapsuleCreateRequestDto(
+data class CapsuleCreateRequestDto(
     val capsuleSkinId: Long,
     val content: String,
     val directory: String,

diff --git a/...esponse/SecretCapsuleDetailResponseDto.kt → ...ta/dto/common/CapsuleDetailResponseDto.kt b/...esponse/SecretCapsuleDetailResponseDto.kt → ...ta/dto/common/CapsuleDetailResponseDto.kt
@@ -1,12 +1,16 @@
-package com.droidblossom.archive.data.dto.secret.response
+package com.droidblossom.archive.data.dto.common
 
-import com.droidblossom.archive.domain.model.secret.SecretCapsuleDetail
+import com.droidblossom.archive.domain.model.common.CapsuleDetail
+import com.droidblossom.archive.domain.model.common.SocialCapsules
 
-data class SecretCapsuleDetailResponseDto(
+data class CapsuleDetailResponseDto(
     val address: String,
+    val roadName: String?,
     val capsuleSkinUrl: String,
     val content: String?,
     val createdDate: String,
+    val latitude: Double,
+    val longitude: Double,
     val profileUrl: String,
     val dueDate: String?,
     val isOpened: Boolean,
@@ -16,8 +20,9 @@ data class SecretCapsuleDetailResponseDto(
     val title: String,
     val capsuleType: String,
 ){
-    fun toModel() = SecretCapsuleDetail(
+    fun toModel() = CapsuleDetail(
         address = this.address,
+        roadName = this.roadName ?: "",
         capsuleSkinUrl = this.capsuleSkinUrl,
         content = this.content ?: "",
         createdDate = this.createdDate,

diff --git a/...d/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/CapsuleSummaryDto.kt b/...d/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/CapsuleSummaryDto.kt
@@ -1,6 +1,7 @@
 package com.droidblossom.archive.data.dto.common
 
-import com.droidblossom.archive.domain.model.common.CapsuleMarker
+import com.droidblossom.archive.domain.model.capsule.CapsuleAnchor
+import com.droidblossom.archive.domain.model.capsule.CapsuleMarker
 import com.droidblossom.archive.presentation.ui.home.HomeFragment
 
 data class CapsuleSummaryDto(
@@ -13,11 +14,18 @@ data class CapsuleSummaryDto(
     val dueDate: String,
     val capsuleType: String,
 ){
-    fun toModel() = CapsuleMarker(
+    fun toAnchorModel() = CapsuleAnchor(
         id = this.id,
         longitude = this.longitude,
         latitude = this.latitude,
         capsuleType = HomeFragment.CapsuleType.valueOf(capsuleType),
         skinUrl = this.capsuleSkinUrl
     )
+
+    fun toMarkerModel() = CapsuleMarker(
+        id = this.id,
+        longitude = this.longitude,
+        latitude = this.latitude,
+        capsuleType = HomeFragment.CapsuleType.valueOf(capsuleType),
+    )
 }
diff --git a/...sponse/SecretCapsuleSummaryResponseDto.kt → ...a/dto/common/CapsuleSummaryResponseDto.kt b/...sponse/SecretCapsuleSummaryResponseDto.kt → ...a/dto/common/CapsuleSummaryResponseDto.kt
@@ -1,26 +1,28 @@
-package com.droidblossom.archive.data.dto.secret.response
+package com.droidblossom.archive.data.dto.common
 
-import com.droidblossom.archive.domain.model.secret.SecretCapsuleSummary
+import com.droidblossom.archive.domain.model.common.CapsuleSummaryResponse
 
-data class SecretCapsuleSummaryResponseDto(
+data class CapsuleSummaryResponseDto(
     val nickname: String,
     val profileUrl: String,
     val skinUrl: String,
     val title: String,
     val dueDate: String?,
+    val latitude: Double,
+    val longitude: Double,
     val address: String,
-    val roadName: String,
+    val roadName: String?,
     val isOpened: Boolean,
     val createdAt: String
 ){
-    fun toModel() = SecretCapsuleSummary(
+    fun toModel() = CapsuleSummaryResponse(
         nickname = this.nickname,
         profileUrl = this.profileUrl,
         skinUrl = this.skinUrl,
         title = this.title,
         dueDate = this.dueDate ?: "",
         address = this.address,
-        roadName = this.roadName,
+        roadName = this.roadName ?: "",
         isOpened = this.isOpened,
         createdAt = this.createdAt,
     )

diff --git a/...nd/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/PagingRequestDto.kt b/...nd/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/PagingRequestDto.kt
@@ -0,0 +1,6 @@
+package com.droidblossom.archive.data.dto.common
+
+data class PagingRequestDto(
+    val size : Int,
+    val createdAt: String
+)
diff --git a/.../src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendAcceptRequestDto.kt b/.../src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendAcceptRequestDto.kt
@@ -0,0 +1,5 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class FriendAcceptRequestDto (
+    val friendId : Long
+)
diff --git a/...app/src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendReqRequestDto.kt b/...app/src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendReqRequestDto.kt
@@ -0,0 +1,5 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class FriendReqRequestDto(
+    val friendId : Long
+)
diff --git a/...pp/src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendsReqRequestDto.kt b/...pp/src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendsReqRequestDto.kt
@@ -0,0 +1,5 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class FriendsReqRequestDto(
+    val friendIds : List<Int>
+)
diff --git a/...ain/java/com/droidblossom/archive/data/dto/friend/request/FriendsSearchPhoneRequestDto.kt b/...ain/java/com/droidblossom/archive/data/dto/friend/request/FriendsSearchPhoneRequestDto.kt
@@ -0,0 +1,5 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class FriendsSearchPhoneRequestDto(
+    val phoneBooks : List<PhoneBooks>
+)
diff --git a/...src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendsSearchRequestDto.kt b/...src/main/java/com/droidblossom/archive/data/dto/friend/request/FriendsSearchRequestDto.kt
@@ -0,0 +1,5 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class FriendsSearchRequestDto (
+    val friendTag : String
+)
diff --git a/.../ARchive/app/src/main/java/com/droidblossom/archive/data/dto/friend/request/PhoneBooks.kt b/.../ARchive/app/src/main/java/com/droidblossom/archive/data/dto/friend/request/PhoneBooks.kt
@@ -0,0 +1,6 @@
+package com.droidblossom.archive.data.dto.friend.request
+
+data class PhoneBooks (
+    val originPhone: String,
+    val originName : String,
+)
diff --git a/...main/java/com/droidblossom/archive/data/dto/friend/response/FriendReqStatusResponseDto.kt b/...main/java/com/droidblossom/archive/data/dto/friend/response/FriendReqStatusResponseDto.kt
@@ -0,0 +1,15 @@
+package com.droidblossom.archive.data.dto.friend.response
+
+import com.droidblossom.archive.domain.model.friend.FriendReqStatusResponse
+import java.io.Serializable
+
+data class FriendReqStatusResponseDto (
+    val httpStatus : String,
+    val result : String
+) : Serializable {
+
+    fun toModel() = FriendReqStatusResponse(
+        httpStatus = this.httpStatus,
+        result = this.result,
+    )
+}
diff --git a/.../app/src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendResponseDto.kt b/.../app/src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendResponseDto.kt
@@ -0,0 +1,18 @@
+package com.droidblossom.archive.data.dto.friend.response
+
+import com.droidblossom.archive.domain.model.friend.Friend
+
+data class FriendResponseDto(
+    val createdAt: String,
+    val id: Long,
+    val nickname: String,
+    val profileUrl: String
+) {
+    fun toModel() = Friend(
+        createdAt = this.createdAt,
+        id = this.id,
+        nickname = this.nickname,
+        profileUrl = this.profileUrl,
+        isOpenDelete = false
+    )
+}
diff --git a/...src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendsPageResponseDto.kt b/...src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendsPageResponseDto.kt
@@ -0,0 +1,13 @@
+package com.droidblossom.archive.data.dto.friend.response
+
+import com.droidblossom.archive.domain.model.friend.FriendsPage
+
+data class FriendsPageResponseDto(
+    val friends: List<FriendResponseDto>,
+    val hasNext: Boolean
+) {
+    fun toModel() = FriendsPage(
+        friends = this.friends.map { it.toModel() },
+        hasNext = this.hasNext
+    )
+}
diff --git a/...n/java/com/droidblossom/archive/data/dto/friend/response/FriendsSearchPhoneResponseDto.kt b/...n/java/com/droidblossom/archive/data/dto/friend/response/FriendsSearchPhoneResponseDto.kt
@@ -0,0 +1,13 @@
+package com.droidblossom.archive.data.dto.friend.response
+
+import com.droidblossom.archive.domain.model.friend.FriendsSearchPhoneResponse
+import java.io.Serializable
+
+data class FriendsSearchPhoneResponseDto(
+    val friends : List<FriendsSearchResponseDto>
+) : Serializable {
+
+    fun toModel() = FriendsSearchPhoneResponse(
+        friends = this.friends.map { it.toModel() },
+    )
+}