[feature/register-photo-ui] 사진 등록 UI 구성

app/build.gradle.kts

@@ -26,6 +26,10 @@ android {
         }
     }
 
+    buildFeatures {
+        dataBinding = true
+    }
+
     buildTypes {
         debug {
             firebaseAppDistribution {

app/src/main/AndroidManifest.xml

@@ -104,5 +104,8 @@
         <activity
             android:name=".feature.album.AlbumListActivity"
             android:exported="false" />
+        <activity
+            android:name=".feature.home.photo.AddPhotoActivity"
+            android:exported="true" />
     </application>
 </manifest>

app/src/main/java/com/teampophory/pophory/config/di/MyPageModule.kt

@@ -1,7 +1,7 @@
 package com.teampophory.pophory.config.di
 
-import com.teampophory.pophory.data.repository.DefaultMyPageRepository
-import com.teampophory.pophory.data.repository.MyPageRepository
+import com.teampophory.pophory.data.repository.my.DefaultMyPageRepository
+import com.teampophory.pophory.data.repository.my.MyPageRepository
 import com.teampophory.pophory.network.MyPageNetworkDataSource
 import com.teampophory.pophory.network.retrofit.mypage.RetrofitMyPageNetwork
 import com.teampophory.pophory.network.retrofit.mypage.RetrofitMyPageNetworkApi

app/src/main/java/com/teampophory/pophory/config/di/PhotoModule.kt

@@ -1,7 +1,7 @@
 package com.teampophory.pophory.config.di
 
-import com.teampophory.pophory.data.repository.PhotoRepository
-import com.teampophory.pophory.data.repository.DefaultPhotoRepository
+import com.teampophory.pophory.data.repository.photo.PhotoRepository
+import com.teampophory.pophory.data.repository.photo.DefaultPhotoRepository
 import com.teampophory.pophory.network.PhotoNetworkDataSource
 import com.teampophory.pophory.network.retrofit.album.RetrofitPhotoNetwork
 import com.teampophory.pophory.network.retrofit.album.RetrofitPhotoNetworkApi

app/src/main/java/com/teampophory/pophory/config/di/StoreModule.kt

@@ -1,7 +1,7 @@
 package com.teampophory.pophory.config.di
 
-import com.teampophory.pophory.data.repository.DefaultStoreRepository
-import com.teampophory.pophory.data.repository.StoreRepository
+import com.teampophory.pophory.data.repository.store.DefaultStoreRepository
+import com.teampophory.pophory.data.repository.store.StoreRepository
 import com.teampophory.pophory.network.StoreNetworkDataSource
 import com.teampophory.pophory.network.retrofit.store.RetrofitStoreNetwork
 import com.teampophory.pophory.network.retrofit.store.RetrofitStoreNetworkApi

app/src/main/java/com/teampophory/pophory/data/network/model/auth/Token.kt → app/src/main/java/com/teampophory/pophory/data/model/auth/Token.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.network.model.auth
+package com.teampophory.pophory.data.model.auth
 
 data class Token(
     val accessToken: String,

app/src/main/java/com/teampophory/pophory/data/network/model/auth/UserAccountState.kt → app/src/main/java/com/teampophory/pophory/data/model/auth/UserAccountState.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.network.model.auth
+package com.teampophory.pophory.data.model.auth
 
 enum class UserAccountState(val value: Boolean) {
     REGISTERED(true),

app/src/main/java/com/teampophory/pophory/data/network/model/auth/UserAuthentication.kt → app/src/main/java/com/teampophory/pophory/data/model/auth/UserAuthentication.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.network.model.auth
+package com.teampophory.pophory.data.model.auth
 
 data class UserAuthentication(
     val token: Token,

app/src/main/java/com/teampophory/pophory/data/model/photo/Studio.kt

@@ -0,0 +1,7 @@
+package com.teampophory.pophory.data.model.photo
+
+data class Studio(
+    val id: Long,
+    val name: String,
+    val imageUrl: String?
+)

app/src/main/java/com/teampophory/pophory/data/network/model/auth/AuthResponse.kt

@@ -1,5 +1,7 @@
 package com.teampophory.pophory.data.network.model.auth
 
+import com.teampophory.pophory.data.model.auth.Token
+import com.teampophory.pophory.data.model.auth.UserAuthentication
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 

app/src/main/java/com/teampophory/pophory/data/network/model/photo/StudioResponse.kt

@@ -0,0 +1,30 @@
+package com.teampophory.pophory.data.network.model.photo
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+typealias StudioEntity = com.teampophory.pophory.data.model.photo.Studio
+
+@Serializable
+data class StudioResponse(
+    @SerialName("studios")
+    val studios: List<Studio>
+) {
+    @Serializable
+    data class Studio(
+        @SerialName("id")
+        val id: Long,
+        @SerialName("name")
+        val name: String,
+        @SerialName("imageUrl")
+        val imageUrl: String? = null
+    ) {
+        fun toStudio() = StudioEntity(
+            id = id,
+            name = name,
+            imageUrl = imageUrl
+        )
+    }
+
+    fun toStudios() = studios.map { it.toStudio() }
+}

app/src/main/java/com/teampophory/pophory/data/repository/auth/AuthRepository.kt

@@ -1,7 +1,7 @@
 package com.teampophory.pophory.data.repository.auth
 
-import com.teampophory.pophory.data.network.model.auth.Token
-import com.teampophory.pophory.data.network.model.auth.UserAuthentication
+import com.teampophory.pophory.data.model.auth.Token
+import com.teampophory.pophory.data.model.auth.UserAuthentication
 
 interface AuthRepository {
     suspend fun login(socialToken: String): UserAuthentication

app/src/main/java/com/teampophory/pophory/data/repository/auth/DefaultAuthRepository.kt

@@ -1,8 +1,8 @@
 package com.teampophory.pophory.data.repository.auth
 
 import com.teampophory.pophory.data.local.PophoryDataStore
-import com.teampophory.pophory.data.network.model.auth.Token
-import com.teampophory.pophory.data.network.model.auth.UserAuthentication
+import com.teampophory.pophory.data.model.auth.Token
+import com.teampophory.pophory.data.model.auth.UserAuthentication
 import com.teampophory.pophory.data.network.service.AuthService
 import javax.inject.Inject
 

app/src/main/java/com/teampophory/pophory/data/repository/fake/FakeMyPageInfoRepository.kt

@@ -1,6 +1,6 @@
 package com.teampophory.pophory.data.repository.fake
 
-import com.teampophory.pophory.data.repository.MyPageRepository
+import com.teampophory.pophory.data.repository.my.MyPageRepository
 import com.teampophory.pophory.network.model.MyPageResponse
 import kotlinx.coroutines.delay
 

app/src/main/java/com/teampophory/pophory/data/repository/fake/FakePhotoRepository.kt

@@ -1,6 +1,8 @@
 package com.teampophory.pophory.data.repository.fake
 
-import com.teampophory.pophory.data.repository.PhotoRepository
+import com.teampophory.pophory.common.image.ContentUriRequestBody
+import com.teampophory.pophory.data.model.photo.Studio
+import com.teampophory.pophory.data.repository.photo.PhotoRepository
 import com.teampophory.pophory.network.model.PhotoListResponse
 import kotlinx.coroutines.delay
 
@@ -41,4 +43,17 @@ class FakePhotoRepository : PhotoRepository {
             )
         }
     }
+
+    override suspend fun getStudios(): Result<List<Studio>> {
+        TODO("Not yet implemented")
+    }
+
+    override suspend fun addPhoto(
+        albumId: Int,
+        takenAt: String,
+        studioId: Long,
+        photo: ContentUriRequestBody
+    ): Result<Unit> {
+        TODO("Not yet implemented")
+    }
 }

app/src/main/java/com/teampophory/pophory/data/repository/DefaultMyPageRepository.kt → app/src/main/java/com/teampophory/pophory/data/repository/my/DefaultMyPageRepository.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.repository
+package com.teampophory.pophory.data.repository.my
 
 import com.teampophory.pophory.network.MyPageNetworkDataSource
 import com.teampophory.pophory.network.model.MyPageResponse

app/src/main/java/com/teampophory/pophory/data/repository/MyPageInfoRepository.kt → app/src/main/java/com/teampophory/pophory/data/repository/my/MyPageInfoRepository.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.repository
+package com.teampophory.pophory.data.repository.my
 
 import com.teampophory.pophory.network.model.MyPageResponse
 

app/src/main/java/com/teampophory/pophory/data/repository/photo/DefaultPhotoRepository.kt

@@ -0,0 +1,35 @@
+package com.teampophory.pophory.data.repository.photo
+
+import com.teampophory.pophory.common.image.ContentUriRequestBody
+import com.teampophory.pophory.data.model.photo.Studio
+import com.teampophory.pophory.network.PhotoNetworkDataSource
+import com.teampophory.pophory.network.model.PhotoListResponse
+import javax.inject.Inject
+
+class DefaultPhotoRepository @Inject constructor(
+    private val retrofitPhotoNetwork: PhotoNetworkDataSource
+) : PhotoRepository {
+    override suspend fun getPhotos(): Result<PhotoListResponse> {
+        return runCatching { retrofitPhotoNetwork.getAlbums() }
+    }
+
+    override suspend fun getStudios(): Result<List<Studio>> {
+        return runCatching { retrofitPhotoNetwork.getStudios().toStudios() }
+    }
+
+    override suspend fun addPhoto(
+        albumId: Int,
+        takenAt: String,
+        studioId: Long,
+        photo: ContentUriRequestBody
+    ): Result<Unit> {
+        return runCatching {
+            retrofitPhotoNetwork.addPhoto(
+                albumId,
+                takenAt,
+                studioId,
+                photo
+            )
+        }
+    }
+}

app/src/main/java/com/teampophory/pophory/data/repository/photo/PhotoRepository.kt

@@ -0,0 +1,16 @@
+package com.teampophory.pophory.data.repository.photo
+
+import com.teampophory.pophory.common.image.ContentUriRequestBody
+import com.teampophory.pophory.data.model.photo.Studio
+import com.teampophory.pophory.network.model.PhotoListResponse
+
+interface PhotoRepository {
+    suspend fun getPhotos(): Result<PhotoListResponse>
+    suspend fun getStudios(): Result<List<Studio>>
+    suspend fun addPhoto(
+        albumId: Int,
+        takenAt: String,
+        studioId: Long,
+        photo: ContentUriRequestBody
+    ): Result<Unit>
+}

app/src/main/java/com/teampophory/pophory/data/repository/DefaultStoreRepository.kt → app/src/main/java/com/teampophory/pophory/data/repository/store/DefaultStoreRepository.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.repository
+package com.teampophory.pophory.data.repository.store
 
 import com.teampophory.pophory.network.StoreNetworkDataSource
 import com.teampophory.pophory.network.model.StoreResponse

app/src/main/java/com/teampophory/pophory/data/repository/StoreRepository.kt → app/src/main/java/com/teampophory/pophory/data/repository/store/StoreRepository.kt

@@ -1,4 +1,4 @@
-package com.teampophory.pophory.data.repository
+package com.teampophory.pophory.data.repository.store
 
 import com.teampophory.pophory.network.model.StoreResponse
 

app/src/main/java/com/teampophory/pophory/domain/AuthUseCase.kt

@@ -1,6 +1,6 @@
 package com.teampophory.pophory.domain
 
-import com.teampophory.pophory.data.network.model.auth.UserAccountState
+import com.teampophory.pophory.data.model.auth.UserAccountState
 import com.teampophory.pophory.data.repository.auth.AuthRepository
 import javax.inject.Inject
 

app/src/main/java/com/teampophory/pophory/feature/HomeViewModel.kt

@@ -0,0 +1,13 @@
+package com.teampophory.pophory.feature
+
+import androidx.lifecycle.ViewModel
+import com.teampophory.pophory.feature.home.store.model.AlbumItem
+
+class HomeViewModel : ViewModel() {
+    var currentAlbum: AlbumItem? = null
+        private set
+
+    fun onUpdateAlbum(album: AlbumItem?) {
+        currentAlbum = album
+    }
+}

app/src/main/java/com/teampophory/pophory/feature/album/AlbumListViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.teampophory.pophory.data.repository.PhotoRepository
+import com.teampophory.pophory.data.repository.photo.PhotoRepository
 import com.teampophory.pophory.network.model.toPhotoList
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch

app/src/main/java/com/teampophory/pophory/feature/home/HomeActivity.kt

@@ -1,19 +1,33 @@
 package com.teampophory.pophory.feature.home
 
 import android.os.Bundle
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.activity.viewModels
 import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.commit
 import com.teampophory.pophory.R
 import com.teampophory.pophory.common.view.viewBinding
 import com.teampophory.pophory.databinding.ActivityHomeBinding
+import com.teampophory.pophory.feature.HomeViewModel
 import com.teampophory.pophory.feature.home.mypage.MyPageFragment
+import com.teampophory.pophory.feature.home.photo.AddPhotoActivity
 import com.teampophory.pophory.feature.home.store.StoreFragment
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
 class HomeActivity : AppCompatActivity() {
     private val binding: ActivityHomeBinding by viewBinding(ActivityHomeBinding::inflate)
+    private val viewModel by viewModels<HomeViewModel>()
+    private val imagePicker = registerForActivityResult(ActivityResultContracts.PickVisualMedia()) {
+        it?.let { uri ->
+            val currentAlbum = viewModel.currentAlbum
+            currentAlbum?.let { album ->
+                startActivity(AddPhotoActivity.getIntent(this, uri.toString(), album))
+            }
+        }
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -32,6 +46,9 @@ class HomeActivity : AppCompatActivity() {
             selectedFragment?.let { changeFragment(it) }
             return@setOnItemSelectedListener selectedFragment != null
         }
+        binding.bottomNavFav.setOnClickListener {
+            imagePicker.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+        }
     }
 
     private fun initializeDefaultFragment(savedInstanceState: Bundle?) {

app/src/main/java/com/teampophory/pophory/feature/home/mypage/MyPageViewModel.kt

@@ -4,7 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.teampophory.pophory.data.repository.MyPageRepository
+import com.teampophory.pophory.data.repository.my.MyPageRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.launch
 import javax.inject.Inject