diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardDto.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardDto.kt index 863da65a..1f98906c 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardDto.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardDto.kt @@ -2,10 +2,9 @@ package boostcamp.and07.mindsync.data.network.response.board import kotlinx.serialization.Serializable - @Serializable data class CreateBoardData( val boardId: String, val date: String, val imageUrl: String, -) \ No newline at end of file +) diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardResponse.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardResponse.kt index 0fc2aff6..95926e93 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardResponse.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/board/CreateBoardResponse.kt @@ -8,4 +8,3 @@ data class CreateBoardResponse( val statusCode: Int, val data: CreateBoardData?, ) - diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginDto.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginDto.kt index 7f304f13..16ff3b80 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginDto.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginDto.kt @@ -3,7 +3,6 @@ package boostcamp.and07.mindsync.data.network.response.login import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable - @Serializable data class LoginDto( @SerialName("access_token") diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginResponse.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginResponse.kt index 9003213f..0baa2375 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginResponse.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/LoginResponse.kt @@ -1,6 +1,5 @@ package boostcamp.and07.mindsync.data.network.response.login -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable @@ -10,4 +9,3 @@ data class LoginResponse( val error: String? = null, val data: LoginDto? = null, ) - diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenDto.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenDto.kt index 481238e0..5b7b6c6a 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenDto.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenDto.kt @@ -8,4 +8,3 @@ data class NewAccessTokenDto( @SerialName("access_token") val accessToken: String, ) - diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenResponse.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenResponse.kt index 385daf9f..80657859 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenResponse.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/login/NewAccessTokenResponse.kt @@ -1,6 +1,5 @@ package boostcamp.and07.mindsync.data.network.response.login -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable @@ -10,4 +9,3 @@ data class NewAccessTokenResponse( val error: String? = null, val data: NewAccessTokenDto? = null, ) - diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/mindmap/SerializedCrdtMapper.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/mindmap/SerializedCrdtMapper.kt index 2f6c1b20..961bb487 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/mindmap/SerializedCrdtMapper.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/mindmap/SerializedCrdtMapper.kt @@ -1,6 +1,5 @@ package boostcamp.and07.mindsync.data.network.response.mindmap -import boostcamp.and07.mindsync.data.util.IdGenerator import boostcamp.and07.mindsync.data.crdt.CrdtTree import boostcamp.and07.mindsync.data.crdt.Operation import boostcamp.and07.mindsync.data.crdt.OperationAdd @@ -14,6 +13,7 @@ import boostcamp.and07.mindsync.data.model.CircleNode import boostcamp.and07.mindsync.data.model.Node import boostcamp.and07.mindsync.data.model.RectangleNode import boostcamp.and07.mindsync.data.model.Tree +import boostcamp.and07.mindsync.data.util.IdGenerator import boostcamp.and07.mindsync.ui.util.ExceptionMessage fun SerializedCrdtTree.toCrdtTree(): CrdtTree { diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserDto.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserDto.kt index 2ee9d6de..855eadf5 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserDto.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserDto.kt @@ -3,7 +3,6 @@ package boostcamp.and07.mindsync.data.network.response.user import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable - @Serializable data class UserDto( val uuid: String, diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserReponse.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserReponse.kt index 729cdcd6..e5c2c762 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserReponse.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/data/network/response/user/UserReponse.kt @@ -1,6 +1,5 @@ package boostcamp.and07.mindsync.data.network.response.user -import kotlinx.serialization.SerialName import kotlinx.serialization.Serializable @Serializable @@ -9,4 +8,3 @@ data class UserResponse( val message: String, val data: List? = null, ) - diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt index b72cc500..db9f7ba8 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/dialog/EditDescriptionDialog.kt @@ -13,10 +13,10 @@ import androidx.fragment.app.DialogFragment import androidx.navigation.fragment.navArgs import androidx.navigation.navGraphViewModels import boostcamp.and07.mindsync.R -import boostcamp.and07.mindsync.data.util.NodeGenerator import boostcamp.and07.mindsync.data.crdt.OperationType import boostcamp.and07.mindsync.data.model.CircleNode import boostcamp.and07.mindsync.data.model.RectangleNode +import boostcamp.and07.mindsync.data.util.NodeGenerator import boostcamp.and07.mindsync.databinding.DialogEditDescriptionBinding import boostcamp.and07.mindsync.ui.mindmap.MindMapViewModel diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt index dbb3a6f9..6ed8e1f1 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/mindmap/MindMapViewModel.kt @@ -2,7 +2,6 @@ package boostcamp.and07.mindsync.ui.mindmap import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import boostcamp.and07.mindsync.data.util.IdGenerator import boostcamp.and07.mindsync.data.crdt.CrdtTree import boostcamp.and07.mindsync.data.crdt.Operation import boostcamp.and07.mindsync.data.crdt.OperationAdd @@ -19,6 +18,7 @@ import boostcamp.and07.mindsync.data.network.SocketEventType import boostcamp.and07.mindsync.data.network.SocketState import boostcamp.and07.mindsync.data.network.response.mindmap.SerializedCrdtTree import boostcamp.and07.mindsync.data.network.response.mindmap.SerializedOperation +import boostcamp.and07.mindsync.data.util.IdGenerator import boostcamp.and07.mindsync.ui.util.Dp import boostcamp.and07.mindsync.ui.util.ExceptionMessage import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceActivity.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceActivity.kt index b02cc823..8a98c0c5 100644 --- a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceActivity.kt +++ b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceActivity.kt @@ -6,7 +6,6 @@ import androidx.activity.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.lifecycle.repeatOnLifecycle -import androidx.navigation.findNavController import boostcamp.and07.mindsync.R import boostcamp.and07.mindsync.databinding.ActivityAddSpaceBinding import boostcamp.and07.mindsync.ui.base.BaseActivity