release 0.3.1

boostcampwm2023 · Dec 7, 2023 · 846df84 · 846df84
1 parent b3361f1
commit 846df84
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 16 deletions.
diff --git a/AOS/app/build.gradle.kts b/AOS/app/build.gradle.kts
@@ -28,8 +28,8 @@ android {
         applicationId = "boostcamp.and07.mindsync"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "0.3.0"
+        versionCode = 2
+        versionName = "0.3.1"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_URL", "$url")
         buildConfigField("String", "GOOGLE_SERVER_CLIENT_ID", "$googleServerClientId")

diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/BoardListViewModel.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/BoardListViewModel.kt
@@ -40,7 +40,7 @@ class BoardListViewModel
         }
 
         fun addBoard(
-            part: MultipartBody.Part,
+            part: MultipartBody.Part?,
             name: String,
         ) {
             viewModelScope.launch(coroutineExceptionHandler) {

diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/CreateBoardDialog.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/CreateBoardDialog.kt
@@ -38,7 +38,7 @@ class CreateBoardDialog : DialogFragment() {
 
     private val createBoardViewModel: CreateBoardViewModel by viewModels()
 
-    private var completeListener: ((MultipartBody.Part, String) -> (Unit))? = null
+    private var completeListener: ((MultipartBody.Part?, String) -> (Unit))? = null
 
     private val pickMedia =
         registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { url ->
@@ -59,7 +59,6 @@ class CreateBoardDialog : DialogFragment() {
         registerForActivityResult(
             ActivityResultContracts.StartActivityForResult(),
         ) { result ->
-            Log.d("CreateBoardDialog", "result: ${result.resultCode}")
             if (result.resultCode == RESULT_OK) {
                 result.data?.data?.let { uri ->
                     createImage(uri)
@@ -96,7 +95,7 @@ class CreateBoardDialog : DialogFragment() {
         resizeDialog()
     }
 
-    fun setCompleteListener(listener: (MultipartBody.Part, String) -> (Unit)) {
+    fun setCompleteListener(listener: (MultipartBody.Part?, String) -> (Unit)) {
         this.completeListener = listener
     }
 

diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/CreateBoardViewModel.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/boardlist/CreateBoardViewModel.kt
@@ -39,13 +39,14 @@ class CreateBoardViewModel
             }
         }
 
-        fun changeImageToFile(imageName: String): Pair<MultipartBody.Part, String>? {
+        fun changeImageToFile(imageName: String): Pair<MultipartBody.Part?, String> {
+            val name = _uiState.value.boardName
             imageFile?.let { imageFile ->
                 val icon = fileToMultiPart(imageFile, imageName)
-                val name = _uiState.value.boardName
                 return Pair(icon, name)
+            } ?: run {
+                return Pair(null, name)
             }
-            return null
         }
 
         fun setImageFile(file: File) {

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
@@ -12,7 +12,6 @@ import boostcamp.and07.mindsync.ui.base.BaseActivity
 import boostcamp.and07.mindsync.ui.base.BaseActivityViewModel
 import boostcamp.and07.mindsync.ui.space.SpaceEvent
 import boostcamp.and07.mindsync.ui.util.ImagePickerHandler
-import boostcamp.and07.mindsync.ui.util.SpaceExceptionMessage
 import boostcamp.and07.mindsync.ui.util.toAbsolutePath
 import com.google.android.material.snackbar.Snackbar
 import dagger.hilt.android.AndroidEntryPoint
@@ -56,10 +55,10 @@ class AddSpaceActivity : BaseActivity<ActivityAddSpaceBinding>(R.layout.activity
                             finish()
                         }
 
-                        is Error -> {
+                        is SpaceEvent.Error -> {
                             Snackbar.make(
                                 binding.root,
-                                SpaceExceptionMessage.ERROR_MESSAGE_SPACE_ADD.message,
+                                spaceEvent.message,
                                 Snackbar.LENGTH_SHORT,
                             )
                                 .show()

diff --git a/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceViewModel.kt b/AOS/app/src/main/java/boostcamp/and07/mindsync/ui/space/generate/AddSpaceViewModel.kt
@@ -1,5 +1,7 @@
 package boostcamp.and07.mindsync.ui.space.generate
 
+import android.util.Log
+import android.widget.Space
 import androidx.lifecycle.viewModelScope
 import boostcamp.and07.mindsync.data.repository.login.LogoutEventRepository
 import boostcamp.and07.mindsync.data.repository.space.SpaceRepository
@@ -68,6 +70,10 @@ class AddSpaceViewModel
                         _event.emit(SpaceEvent.Success)
                     }
                 }
+            } ?: run{
+                viewModelScope.launch(coroutineExceptionHandler){
+                    _event.emit(SpaceEvent.Error("사진을 입력해주세요"))
+                }
             }
         }
     }
diff --git a/AOS/app/src/main/res/layout/navigation_drawer_side_bar.xml b/AOS/app/src/main/res/layout/navigation_drawer_side_bar.xml
@@ -128,7 +128,7 @@
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rcv_side_bar_users"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             app:users="@{vm.uiState.users}"
             android:layout_height="wrap_content"
             app:flexBoxLayoutManager="@{FlexDirection.ROW}"

diff --git a/AOS/release_note.txt b/AOS/release_note.txt
@@ -1,5 +1,5 @@
 2023.12.08
-version: 0.3.0
+version: 0.3.1
 💻 Feature Updates
 - 카카오 로그인
 - 마인드 맵
@@ -18,8 +18,9 @@ version: 0.3.0
     - 이미지 편집
     - 닉네임 편집
 🐞Bug Fix
-- 트리 저장 버그 해결
-- 프로필 다이얼로그 회전 버그 해결
+- 사용자가 많을 경우 화면을 벗어나는 버그 해결
+- 보드 추가 이미지 선택 안할 경우 대응
+- 스페이스 추가 사진 선택 안할 경우 대응
 💡 Information
 - 동시에 같은 공간(스페이스/보드)에 접속해있는 사용자끼리 서로의 편집 내용을 실시간으로 확인할 수 있습니다.
 - 다른사람을 자신의 스페이스에 초대할 수 있습니다.