[feat/api_friend] : 마이탭 마시멜로 api 연결 및 분기처리

app/build.gradle.kts

@@ -0,0 +1,116 @@
+plugins {
+    id("com.android.application")
+    id("org.jetbrains.kotlin.android")
+    id("kotlin-parcelize")
+    id("androidx.navigation.safeargs.kotlin")
+    id("dagger.hilt.android.plugin")
+    id("kotlin-kapt")
+}
+
+android {
+    compileSdk = 33
+
+    defaultConfig {
+        applicationId = "com.teampome.pome"
+        minSdk = 23
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+
+        multiDexEnabled = true
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    buildTypes {
+        debug {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            buildConfigField("String", "BASE_URL", "\"http://13.125.237.136:8085/\"")
+            buildConfigField("String", "IMAGE_BASE_URL", "\"http://image-main-server.ap-northeast-2.elasticbeanstalk.com/\"")
+        }
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+            buildConfigField("String", "BASE_URL", "\"http://52.79.89.129/\"")
+            buildConfigField("String", "IMAGE_BASE_URL", "\"http://image-main-server.ap-northeast-2.elasticbeanstalk.com/\"")
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+    dataBinding {
+        enable = true
+    }
+}
+
+dependencies {
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.appcompat:appcompat:1.5.1")
+    implementation("com.google.android.material:material:1.7.0")
+    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.3")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.4.0")
+
+    // Fragment ViewModel
+    val fragmentKtxVersion = "1.5.3"
+    implementation("androidx.fragment:fragment-ktx:$fragmentKtxVersion")
+
+    // Retrofit
+    val retrofitVersion = "2.9.0"
+    implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
+    implementation("com.google.code.gson:gson:$retrofitVersion")
+    implementation("com.squareup.retrofit2:converter-gson:$retrofitVersion")
+
+    val okhttp_version = "4.10.0"
+    implementation("com.squareup.okhttp3:okhttp:$okhttp_version")
+    implementation("com.squareup.okhttp3:logging-interceptor:$okhttp_version")
+
+    // Glide
+    val glide_version = "4.13.2"
+    implementation("com.github.bumptech.glide:glide:$glide_version")
+    kapt("com.github.bumptech.glide:compiler:$glide_version")
+    implementation("com.github.bumptech.glide:okhttp3-integration:$glide_version"){
+        exclude(group = "glide-parent")
+    }
+    implementation("com.github.bumptech.glide:annotations:$glide_version")
+    annotationProcessor("com.github.bumptech.glide:compiler:$glide_version")
+    implementation("com.caverock:androidsvg-aar:1.4")
+
+    // Glide Tranform
+    implementation("jp.wasabeef:glide-transformations:4.3.0")
+
+    // Navigation
+    val navVersion = "2.5.2"
+    implementation("androidx.navigation:navigation-fragment-ktx:$navVersion")
+    implementation("androidx.navigation:navigation-ui-ktx:$navVersion")
+
+    // Hilt
+    val hiltVersion = "2.44"
+    implementation("com.google.dagger:hilt-android:$hiltVersion")
+    kapt("com.google.dagger:hilt-android-compiler:$hiltVersion")
+
+    val kotlinxMetadataJvmVersion = "0.5.0"
+    implementation("org.jetbrains.kotlinx:kotlinx-metadata-jvm:$kotlinxMetadataJvmVersion")
+
+    // Calendar
+    implementation("com.github.prolificinteractive:material-calendarview:2.0.1")
+    implementation("com.jakewharton.threetenabp:threetenabp:1.1.1")
+
+    // DataStore
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+
+    // Paging
+    val pagingVersion = "3.1.1"
+    implementation("androidx.paging:paging-runtime:$pagingVersion")
+}

app/proguard-rules.pro

@@ -1,6 +1,6 @@
 # Add project specific ProGuard rules here.
 # You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
+# proguardFiles setting in build.gradle.kts.
 #
 # For more details, see
 #   http://developer.android.com/guide/developing/tools/proguard.html

app/src/main/java/com/teampome/pome/di/NetworkModule.kt

@@ -207,4 +207,14 @@ object NetworkModule {
             .build()
             .create(RemindService::class.java)
     }
+
+    @Singleton
+    @Provides
+    fun provideMyTabService(
+        @AuthRetrofit retrofit: Retrofit.Builder
+    ) : MyTabService {
+        return retrofit
+            .build()
+            .create(MyTabService::class.java)
+    }
 }

app/src/main/java/com/teampome/pome/di/RepositoryModule.kt

@@ -10,6 +10,9 @@ import com.teampome.pome.repository.goal.GoalRepository
 import com.teampome.pome.repository.login.LoginDataSource
 import com.teampome.pome.repository.login.LoginRemoteDataSource
 import com.teampome.pome.repository.login.LoginRepository
+import com.teampome.pome.repository.mypage.MyPageDataSource
+import com.teampome.pome.repository.mypage.MyPageRemoteDataSource
+import com.teampome.pome.repository.mypage.MyPageRepository
 import com.teampome.pome.repository.record.RecordDataSource
 import com.teampome.pome.repository.record.RecordRepository
 import com.teampome.pome.repository.record.RecordRemoteDataSource
@@ -124,5 +127,17 @@ object RepositoryModule {
         return GoalRepository(dataSource)
     }
 
+    @Provides
+    @Singleton
+    fun provideMyPageSource(service: MyTabService) : MyPageDataSource {
+        return MyPageRemoteDataSource(service)
+    }
+
+    @Provides
+    @Singleton
+    fun provideMyPageRepository(dataSource: MyPageDataSource) : MyPageRepository {
+        return MyPageRepository(dataSource)
+    }
+
 
 }

app/src/main/java/com/teampome/pome/model/mytab/MyTabMarshmello.kt

@@ -0,0 +1,7 @@
+package com.teampome.pome.model.mytab
+
+// Marshmello Response
+data class MyTabMarshmello(
+    val marshmelloName : String,
+    val marshmelloLv : Int
+)

app/src/main/java/com/teampome/pome/model/response/DeleteFriend.kt

@@ -0,0 +1,6 @@
+package com.teampome.pome.model.response
+
+//친구 삭제 Response
+data class DeleteFriend(
+    val data : Boolean
+)

app/src/main/java/com/teampome/pome/model/response/GetFriendRecord.kt

@@ -0,0 +1,48 @@
+package com.teampome.pome.model.response
+
+import android.os.Parcelable
+import kotlinx.parcelize.Parcelize
+
+//내 친구 기록 조회
+@Parcelize
+data class GetFriendRecord(
+    val id : Int,
+    val nickname: String,
+    val usePrice: Int,
+    val useDate: String,
+    val useComment: String,
+    val oneLineMind: String,
+    val createdAt: String,
+    val emotionResponse: FriendEmotion
+) : Parcelable
+
+@Parcelize
+data class FriendEmotion(
+    val firstEmotion : Int,
+    val secondEmotion : Int,
+    val myEmotion : Int,
+    val friendEmotion : List<Int>
+) : Parcelable
+
+/*
+"id": 3,
+        "nickname": "찬영짱121",
+        "usePrice": 2000,
+        "useDate": "2023.01.26",
+        "useComment": "앞으로 이렇게만!",
+        "oneLineMind": "커피는 백다방만",
+        "createdAt": "2023-01-26T20:11:16",
+        "emotionResponse": {
+          "firstEmotion": 1,
+          "secondEmotion": null,
+          "myEmotion": null,
+          "friendEmotions": []
+        }
+ */
+
+/*
+"firstEmotion": 1,
+          "secondEmotion": null,
+          "myEmotion": null,
+          "friendEmotions": []
+ */

app/src/main/java/com/teampome/pome/network/AddFriendsService.kt

@@ -1,9 +1,13 @@
 package com.teampome.pome.network
 
+import com.teampome.pome.model.base.BaseAllData
 import com.teampome.pome.model.base.BasePomeResponse
 import com.teampome.pome.model.friend.FriendData
+import com.teampome.pome.model.response.DeleteFriend
+import com.teampome.pome.model.response.GetFriendRecord
 import com.teampome.pome.model.response.GetFriends
 import retrofit2.Response
+import retrofit2.http.DELETE
 import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.Path
@@ -26,4 +30,15 @@ interface AddFriendsService {
     @GET("api/v1/users/friends")
     suspend fun getFriend()
         : Response<BasePomeResponse<List<GetFriends>>>
+
+    //친구 기록 조회
+    @GET("api/v1/records/users/{userId}")
+    suspend fun getFriendRecord(
+        @Path("userId") userId: String
+    ) : Response<BasePomeResponse<BaseAllData<GetFriendRecord>>>
+
+    @DELETE("api/v1/users/friend/{friendId}")
+    suspend fun deleteFriend(
+        @Path("friendId") friendId: String
+    ) : Response<BasePomeResponse<DeleteFriend>>
 }

app/src/main/java/com/teampome/pome/network/MyTabService.kt

@@ -0,0 +1,15 @@
+package com.teampome.pome.network
+
+import com.teampome.pome.model.base.BasePomeResponse
+import com.teampome.pome.model.mytab.MyTabMarshmello
+import retrofit2.Response
+import retrofit2.http.GET
+
+//마이 탭 서비스
+interface MyTabService {
+
+    //마시멜로우 조합
+    @GET("api/v1/marshmello/list")
+    suspend fun getMarshmello()
+        : Response<BasePomeResponse<List<MyTabMarshmello>>>
+}