diff --git a/AOS/app/build.gradle.kts b/AOS/app/build.gradle.kts index 54a41f38..4c30b606 100644 --- 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 index 257ba442..d67e7a34 100644 --- 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 index 10cbbaf6..c23691d5 100644 --- 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 index 9ce56a4e..471c35a8 100644 --- 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? { + fun changeImageToFile(imageName: String): Pair { + 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 index bdb6fb24..cd048a70 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 @@ -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(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 index d170e4a5..de69dba5 100644 --- 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 index 6a2b868f..eda6bf37 100644 --- 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 @@