🚑 merge conflict 해결

Related to #64
APP-Android2 · Apr 25, 2024 · e5ebb89 · e5ebb89
2 parents 0875371 + ab22bbd
commit e5ebb89
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/farming_customer/app/build.gradle.kts b/farming_customer/app/build.gradle.kts
@@ -43,6 +43,7 @@ android {
 }
 
 dependencies {
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.appcompat:appcompat:1.6.1")
     implementation("com.google.android.material:material:1.11.0")
@@ -68,8 +69,6 @@ dependencies {
     implementation("com.google.firebase:firebase-storage:20.3.0")
     implementation("com.github.bumptech.glide:glide:4.16.0")
 
-    implementation("com.github.bumptech.glide:glide:4.16.0")
-
     // Retrofit2
     implementation("com.squareup.retrofit2:retrofit:2.11.0")
     implementation("com.squareup.retrofit2:converter-gson:2.11.0")
@@ -83,4 +82,8 @@ dependencies {
     implementation("pl.droidsonroids.gif:android-gif-drawable:1.2.19")
 
 
+    // glide
+    implementation ("com.firebaseui:firebase-ui-storage:7.2.0")
+    kapt ("com.github.bumptech.glide:compiler:4.12.0")
+
 }
diff --git a/farming_customer/app/src/main/java/kr/co/lion/farming_customer/Tools.kt b/farming_customer/app/src/main/java/kr/co/lion/farming_customer/Tools.kt
@@ -396,7 +396,6 @@ enum class InquiryState(var str:String, var number:Int) {
     INQUIRY_STATE_NORMAL("정상", 0),
     INQUIRY_STATE_REMOVE("삭제", 1)
 }
-
 enum class InquiryType(var str: String, var number:Int) {
     TYPE_CROP("농작물", 0),
     TYPE_FARM("주말농장", 1),

diff --git a/farming_customer/app/src/main/java/kr/co/lion/farming_customer/fragment/HomeFragment.kt b/farming_customer/app/src/main/java/kr/co/lion/farming_customer/fragment/HomeFragment.kt
@@ -98,7 +98,6 @@ class HomeFragment : Fragment() {
             fragmentHomeBinding.viewPagerFarm.adapter?.notifyDataSetChanged()
             fragmentHomeBinding.viewPagerCrop.adapter?.notifyDataSetChanged()
             fragmentHomeBinding.recyclerViewBoard.adapter?.notifyDataSetChanged()
-
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -98,7 +98,6 @@ class HomeFragment : Fragment() { @@
                 fragmentHomeBinding.viewPagerFarm.adapter?.notifyDataSetChanged()
                 fragmentHomeBinding.viewPagerCrop.adapter?.notifyDataSetChanged()
                 fragmentHomeBinding.recyclerViewBoard.adapter?.notifyDataSetChanged()
             }
         }
@@ Expand Down @@