[#44] 깃 충돌 수정

APP-Android2 · Apr 16, 2024 · 288be59 · 288be59
1 parent 5d9c504
commit 288be59
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 33 deletions.
diff --git a/MungNolZa/app/src/main/AndroidManifest.xml b/MungNolZa/app/src/main/AndroidManifest.xml
@@ -21,16 +21,16 @@
         android:theme="@style/Theme.MungNolZa"
         tools:targetApi="31">
         <activity
-<<<<<<< HEAD
+
             android:name=".ui.freeboard.AddBoardActivity"
             android:exported="false" />
-=======
+        <activity
             android:name=".ui.appointment.NoPetActivity"
             android:exported="true" />
         <activity
             android:name=".ui.intro.activity.AddressActivity"
             android:exported="true" />
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
+
         <activity
             android:name=".ui.TestActivity"
             android:exported="true" />
@@ -64,17 +64,14 @@
             </intent-filter>
         </activity>
         <activity
-<<<<<<< HEAD
+
             android:name=".ui.intro.activity.JoinActivity"
             android:exported="true" />
         <activity
             android:name=".ui.intro.activity.StartActivity"
             android:exported="true"></activity>
         <activity
-            android:name=".ui.intro.activity.OnBoardingActivity"
-=======
             android:name=".ui.onboarding.OnBoardingActivity"
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
             android:exported="true" />
         <activity
             android:name=".ui.intro.activity.LoginActivity"

diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/datasource/MainDataStore.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/datasource/MainDataStore.kt
@@ -11,10 +11,7 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import kr.co.lion.mungnolza.util.App
 
-<<<<<<< HEAD
 
-=======
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
 object MainDataStore {
     private fun getContext(): Context = App.context()
 

diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/repository/user/UserRepository.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/repository/user/UserRepository.kt
@@ -5,10 +5,8 @@ import java.net.URI
 
 interface UserRepository {
     suspend fun fetchAllUserData() : List<UserModel>
-<<<<<<< HEAD
-=======
+
     suspend fun fetchUserAddress(uniqueNumber: String) : String
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
     suspend fun fetchAllUserNickName(uniqueNumber: String) : List<String>
     suspend fun fetchUserProfileImage(path: String) : URI?
 }
diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/repository/user/UserRepositoryImpl.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/repository/user/UserRepositoryImpl.kt
@@ -22,8 +22,6 @@ class UserRepositoryImpl : UserRepository {
         }
     }
 
-<<<<<<< HEAD
-=======
     override suspend fun fetchUserAddress(uniqueNumber: String): String {
         return try {
             val querySnapshot = userStore.whereEqualTo("uniqueNumber", uniqueNumber).get().await()
@@ -35,7 +33,6 @@ class UserRepositoryImpl : UserRepository {
         }
     }
 
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
     override suspend fun fetchAllUserNickName(uniqueNumber: String): List<String> {
         return withContext(Dispatchers.IO) {
             try {

diff --git a/...a/app/src/main/java/kr/co/lion/mungnolza/ui/freeboard/fragment/ShowDetailBoardFragment.kt b/...a/app/src/main/java/kr/co/lion/mungnolza/ui/freeboard/fragment/ShowDetailBoardFragment.kt
@@ -10,7 +10,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.viewModels
-<<<<<<< HEAD
+
 import androidx.lifecycle.lifecycleScope
 import com.bumptech.glide.Glide
 import com.google.android.material.carousel.CarouselLayoutManager
@@ -23,11 +23,6 @@ import kotlinx.coroutines.launch
 import kr.co.lion.mungnolza.R
 import kr.co.lion.mungnolza.data.repository.BoardRepository
 import kr.co.lion.mungnolza.data.repository.BoardRepositoryImpl
-=======
-import com.google.android.material.carousel.CarouselLayoutManager
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kr.co.lion.mungnolza.R
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
 import kr.co.lion.mungnolza.databinding.FragmentShowDetailBoardBinding
 import kr.co.lion.mungnolza.model.BoardModel
 import kr.co.lion.mungnolza.model.UserModel

diff --git a/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/FreeBoardFragment.kt b/MungNolZa/app/src/main/java/kr/co/lion/mungnolza/ui/main/fragment/FreeBoardFragment.kt
@@ -25,11 +25,9 @@ class FreeBoardFragment : Fragment(R.layout.fragment_free_board) {
     private var _binding: FragmentFreeBoardBinding? = null
     private val binding get() = _binding!!
     private val viewModel: MainViewModel by activityViewModels { MainViewModelFactory() }
-<<<<<<< HEAD
+
     private lateinit var freeBoardAdapter: FreeBoardAdapter
-=======
 
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         _binding = FragmentFreeBoardBinding.bind(view)
@@ -49,13 +47,10 @@ class FreeBoardFragment : Fragment(R.layout.fragment_free_board) {
                             val writerData = viewModel.findUserData(selectedItemData.boardWriterIdx)
 
                             val intent = Intent(requireContext(), BoardActivity::class.java)
-<<<<<<< HEAD
+
                             intent.putExtra("boardData", selectedItemData)
                             intent.putExtra("userData", writerData)
-=======
-                            intent.putExtra("content", selectedItemData)
-                            intent.putExtra("writer", writerData)
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
+
 
                             startActivity(intent)
                         }
@@ -84,8 +79,5 @@ class FreeBoardFragment : Fragment(R.layout.fragment_free_board) {
         super.onDestroyView()
         _binding = null
     }
-<<<<<<< HEAD
 
-=======
->>>>>>> 0e73214e0419402e5d3d00412ff2905432afe7a8
 }