Merge pull request #508 from tukcomCD2024/develop_front

Develop front -> maste

frontend/ARchive/.gitignore

@@ -29,6 +29,7 @@ render.experimental.xml
 *.keystore
 
 # Google Services (e.g. APIs or Firebase)
+app/google-services.json
 google-services.json
 
 # Android Profiling

frontend/ARchive/app/build.gradle

@@ -7,6 +7,7 @@ plugins {
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
     id 'com.google.android.gms.oss-licenses-plugin'
+    id 'kotlin-parcelize'
 }
 
 Properties properties = new Properties()

frontend/ARchive/app/src/main/AndroidManifest.xml

@@ -34,33 +34,44 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
         <activity
-            android:name=".presentation.ui.mypage.friend.addgroup.AddGroupActivity"
-            android:screenOrientation="portrait"
+            android:name=".presentation.ui.mypage.friend.detail.group.management.ManagementGroupMemberActivity"
             android:exported="false" />
         <activity
-            android:name=".presentation.ui.mypage.friendaccept.FriendAcceptActivity"
-            android:screenOrientation="portrait"
+            android:name=".presentation.ui.mypage.friend.detail.group.GroupDetailActivity"
             android:exported="false" />
+        <activity
+            android:name=".presentation.ui.mypage.friend.detail.friend.FriendDetailActivity"
+            android:exported="false"
+            android:parentActivityName=".presentation.ui.mypage.friend.FriendActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".presentation.ui.mypage.friend.addgroup.AddGroupActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".presentation.ui.mypage.friendaccept.FriendAcceptActivity"
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.mypage.friend.addfriend.AddFriendActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.mypage.friend.FriendActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.home.notification.NotificationActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.mypage.setting.SettingActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.ErrorActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
+            android:exported="false"
+            android:screenOrientation="portrait" />
         <activity
             android:name=".presentation.ui.permission.PermissionActivity"
             android:exported="false" />

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/open/response/MyPublicCapsuleResponseDto.kt → frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/CapsuleBasicInfoResponseDto.kt

@@ -1,8 +1,8 @@
-package com.droidblossom.archive.data.dto.open.response
+package com.droidblossom.archive.data.dto.common
 
 import com.droidblossom.archive.presentation.model.mypage.CapsuleData
 
-data class MyPublicCapsuleResponseDto(
+data class CapsuleBasicInfoResponseDto (
     val capsuleId : Long,
     val skinUrl : String,
     val dueDate : String?,

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/CapsuleSummaryResponseDto.kt

@@ -16,8 +16,8 @@ data class CapsuleSummaryResponseDto(
     val createdAt: String
 ){
     fun toModel() = CapsuleSummaryResponse(
-        nickname = this.nickname,
-        profileUrl = this.profileUrl,
+        nicknameOrGroupName = this.nickname,
+        profileOrGroupProfileUrl = this.profileUrl,
         skinUrl = this.skinUrl,
         title = this.title,
         dueDate = this.dueDate ?: "",

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/common/IdBasedPagingRequestDto.kt

@@ -0,0 +1,6 @@
+package com.droidblossom.archive.data.dto.common
+
+data class IdBasedPagingRequestDto(
+    val size : Int,
+    val pagingId: Long?
+)

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendResponseDto.kt

@@ -1,6 +1,8 @@
 package com.droidblossom.archive.data.dto.friend.response
 
 import com.droidblossom.archive.domain.model.friend.Friend
+import com.droidblossom.archive.domain.model.friend.FriendsSearchResponse
+import com.droidblossom.archive.presentation.model.mypage.detail.FriendForGroupInvite
 
 data class FriendResponseDto(
     val createdAt: String,
@@ -15,4 +17,24 @@ data class FriendResponseDto(
         profileUrl = this.profileUrl,
         isOpenDelete = false
     )
+
+    fun toFriendsSearchModel() = FriendsSearchResponse(
+        createdAt = "",
+        id = this.id,
+        profileUrl = this.profileUrl,
+        nickname = this.nickname,
+        isFriend = false,
+        isFriendInviteToFriend = false,
+        isFriendInviteToMe = false,
+        name = "",
+        isChecked = false
+    )
+
+    fun toFriendsForGroupInvite() = FriendForGroupInvite(
+        id = this.id,
+        nickname = this.nickname,
+        profileUrl = this.profileUrl,
+        createdAt = this.createdAt,
+        isChecked = false
+    )
 }

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendsPageResponseDto.kt

@@ -10,4 +10,14 @@ data class FriendsPageResponseDto(
         friends = this.friends.map { it.toModel() },
         hasNext = this.hasNext
     )
+
+    fun toModelForAddGroup() = FriendsPage(
+        friends = this.friends.map { it.toFriendsSearchModel() },
+        hasNext = this.hasNext
+    )
+
+    fun toModelForGroupInvite() = FriendsPage(
+        friends = this.friends.map { it.toFriendsForGroupInvite() },
+        hasNext = this.hasNext
+    )
 }

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/friend/response/FriendsSearchResponseDto.kt

@@ -15,6 +15,7 @@ data class FriendsSearchResponseDto(
 ) : Serializable {
 
     fun toModel() = FriendsSearchResponse(
+        createdAt = "",
         id = this.id,
         profileUrl = this.profileUrl,
         nickname = this.nickname,

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/request/CreateGroupRequestDto.kt

@@ -0,0 +1,9 @@
+package com.droidblossom.archive.data.dto.group.request
+
+data class CreateGroupRequestDto(
+    val description: String,
+    val groupDirectory: String,
+    val groupImage: String,
+    val groupName: String,
+    val targetIds: List<Long>
+)

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/request/InviteGroupRequestDto.kt

@@ -0,0 +1,6 @@
+package com.droidblossom.archive.data.dto.group.request
+
+data class InviteGroupRequestDto (
+    val groupId : Long,
+    val targetIds : List<Long>
+)

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupDetailResponseDto.kt

@@ -0,0 +1,23 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupDetail
+
+data class GroupDetailResponseDto(
+    val groupName: String,
+    val groupProfileUrl: String,
+    val groupDescription: String,
+    val createdAt: String,
+    val groupCapsuleTotalCount: Int,
+    val canGroupEdit: Boolean,
+    val members: List<GroupMemberResponseDto>,
+){
+    fun toModel() = GroupDetail(
+        groupName = this.groupName,
+        groupProfileUrl = this.groupProfileUrl,
+        groupDescription = this.groupDescription,
+        createdAt = this.createdAt,
+        groupCapsuleTotalCount = this.groupCapsuleTotalCount,
+        canGroupEdit = this.canGroupEdit,
+        members = this.members.map { it.toGroupDetailModel() }
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupInviteResponseDto.kt

@@ -0,0 +1,22 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupInviteSummary
+import com.droidblossom.archive.domain.model.group.GroupPage
+
+data class GroupInviteResponseDto(
+    val groupReceivingInviteTime: String,
+    val description: String,
+    val groupId: Long,
+    val groupName: String,
+    val groupOwnerName: String,
+    val groupProfileUrl: String
+) {
+    fun toModel() = GroupInviteSummary(
+        createdAt = this.groupReceivingInviteTime,
+        description = this.description,
+        groupId = this.groupId,
+        groupName = this.groupName,
+        groupOwnerName = this.groupOwnerName,
+        groupProfileUrl = this.groupProfileUrl,
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupInvitedUserResponseDto.kt

@@ -0,0 +1,19 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupInvitedUser
+
+data class GroupInvitedUserResponseDto (
+    val groupInviteId: Long,
+    val memberId: Long,
+    val nickname: String,
+    val profileUrl: String,
+    val sendingInvitesCreatedAt: String,
+){
+    fun toModel() = GroupInvitedUser(
+        groupInviteId = this.groupInviteId,
+        memberId = this.memberId,
+        nickname = this.nickname,
+        profileUrl = this.profileUrl,
+        sendingInvitesCreatedAt = this.sendingInvitesCreatedAt
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupInvitedUsersPageResponseDto.kt

@@ -0,0 +1,13 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupInvitedUsersPage
+
+data class GroupInvitedUsersPageResponseDto (
+    val groupSendingInviteMembers: List<GroupInvitedUserResponseDto>,
+    val hasNext: Boolean
+){
+    fun toModel() = GroupInvitedUsersPage(
+        groupSendingInviteMembers = this.groupSendingInviteMembers.map { it.toModel() },
+        hasNext = this.hasNext
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupInvitesPageResponseDto.kt

@@ -0,0 +1,13 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupPage
+
+data class GroupInvitesPageResponseDto(
+    val hasNext: Boolean,
+    val responses: List<GroupInviteResponseDto>
+) {
+    fun toModel() = GroupPage(
+        groups = this.responses.map { it.toModel() },
+        hasNext = this.hasNext
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupMemberResponseDto.kt

@@ -0,0 +1,30 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupMember
+
+data class GroupMemberResponseDto(
+    val memberId: Long,
+    val profileUrl: String,
+    val nickname: String,
+    val tag: String,
+    val isOwner: Boolean,
+    val isFriend: Boolean
+){
+    fun toGroupDetailModel() = GroupMember(
+        memberId = this.memberId,
+        profileUrl = this.profileUrl,
+        nickname = this.nickname,
+        tag = this.tag,
+        isOwner = this.isOwner,
+        isFriend = this.isFriend
+    )
+
+    fun toGroupMemberListModel() = GroupMember(
+        memberId = this.memberId,
+        profileUrl = this.profileUrl,
+        nickname = this.nickname,
+        tag = this.tag,
+        isOwner = this.isOwner,
+        isFriend = false
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupMembersInfoResponseDto.kt

@@ -0,0 +1,11 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupMembersInfo
+
+data class GroupMembersInfoResponseDto (
+    val groupMemberResponses : List<GroupMemberResponseDto>
+){
+    fun toModel() = GroupMembersInfo(
+        groupMemberResponses = this.groupMemberResponses.map { it.toGroupMemberListModel() }
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupPageResponseDto.kt

@@ -0,0 +1,13 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupPage
+
+data class GroupPageResponseDto(
+    val groups: List<GroupSummaryResponseDto>,
+    val hasNext: Boolean
+) {
+    fun toModel() = GroupPage (
+        groups = this.groups.map { it.toModel() },
+        hasNext = this.hasNext,
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/GroupSummaryResponseDto.kt

@@ -0,0 +1,23 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.domain.model.group.GroupSummary
+
+data class GroupSummaryResponseDto(
+    val createdAt: String,
+    val groupOwnerProfileUrl: String,
+    val totalGroupMemberCount : Int,
+    val id: Long,
+    val isOwner: Boolean,
+    val name: String,
+    val profileUrl: String
+) {
+    fun toModel() = GroupSummary(
+        createdAt = this.createdAt,
+        totalGroupMemberCount = this.totalGroupMemberCount,
+        groupOwnerProfileUrl = this.groupOwnerProfileUrl,
+        id = this.id,
+        isOwner = this.isOwner,
+        name = this.name,
+        profileUrl = this.profileUrl
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group/response/MyGroupCapsulePageResponseDto.kt

@@ -0,0 +1,14 @@
+package com.droidblossom.archive.data.dto.group.response
+
+import com.droidblossom.archive.data.dto.common.CapsuleBasicInfoResponseDto
+import com.droidblossom.archive.domain.model.secret.CapsulePageList
+
+data class MyGroupCapsulePageResponseDto(
+    val groupCapsules: List<CapsuleBasicInfoResponseDto>,
+    val hasNext: Boolean,
+) {
+    fun toModel() = CapsulePageList(
+        capsules = this.groupCapsules.map { it.toUIModel() },
+        hasNext = this.hasNext,
+    )
+}

frontend/ARchive/app/src/main/java/com/droidblossom/archive/data/dto/group_capsule/CapsulesOfGroupResponseDto.kt

@@ -0,0 +1,14 @@
+package com.droidblossom.archive.data.dto.group_capsule
+
+import com.droidblossom.archive.data.dto.common.CapsuleBasicInfoResponseDto
+import com.droidblossom.archive.domain.model.secret.CapsulePageList
+
+data class CapsulesOfGroupResponseDto(
+    val capsuleBasicInfos : List<CapsuleBasicInfoResponseDto>,
+    val hasNext: Boolean
+){
+    fun toModel() = CapsulePageList(
+        capsules = this.capsuleBasicInfos.map { it.toUIModel() },
+        hasNext = this.hasNext,
+    )
+}