Merge pull request #60 from ttoklip/feat/#15_첫화면로그인_구현

Feat/#15 첫화면로그인 구현

app/src/main/AndroidManifest.xml

@@ -133,6 +133,12 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
+        <activity android:name=".presentation.signup.location.LocationActivity"
+            android:screenOrientation="portrait"
+            android:exported="false"/>
+        <activity android:name=".presentation.signup.location.DirectLocationActivity"
+            android:screenOrientation="portrait"
+            android:exported="false"/>
         <activity
             android:name=".presentation.hometown.PlaceActivity"
             android:screenOrientation="portrait"
@@ -143,14 +149,6 @@
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan"
             android:exported="false" />
-        <activity
-            android:name=".presentation.signup.LocationActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
-        <activity
-            android:name=".presentation.signup.DirectLocationActivity"
-            android:screenOrientation="portrait"
-            android:exported="false" />
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
@@ -170,7 +168,6 @@
             android:name=".presentation.intro.SplashActivity"
             android:screenOrientation="portrait"
             android:exported="true">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -180,7 +177,6 @@
             android:screenOrientation="portrait"
             android:name=".presentation.MainActivity"
             android:exported="true">
-
 <!--            <intent-filter>-->
 <!--                <action android:name="android.intent.action.MAIN" />-->
 <!--                <category android:name="android.intent.category.LAUNCHER" />-->

app/src/main/java/com/umc/ttoklip/data/api/KakaoApi.kt

@@ -8,7 +8,7 @@ import retrofit2.http.Header
 import retrofit2.http.Query
 
 interface KakaoApi {
-    @GET("v2/local/search/keyword.json")
+    @GET("v2/local/search/address")
     fun getSearchKeyword(
         @Header("Authorization") key: String,
         @Query("query") query:String

app/src/main/java/com/umc/ttoklip/data/api/MyPage2Api.kt

@@ -1,27 +1,27 @@
-package com.umc.ttoklip.data.api
-
-import com.umc.ttoklip.data.model.ResponseBody
-import com.umc.ttoklip.data.model.honeytip.CreateHoneyTipResponse
-import com.umc.ttoklip.data.model.mypage.MyPageInfoResponse
-import okhttp3.MultipartBody
-import okhttp3.RequestBody
-import retrofit2.Response
-import retrofit2.http.GET
-import retrofit2.http.Multipart
-import retrofit2.http.PATCH
-import retrofit2.http.POST
-import retrofit2.http.Part
-import retrofit2.http.PartMap
-
-interface MyPage2Api {
-    @GET("/api/v1/my-page")
-    suspend fun getMyPageInfo(): Response<ResponseBody<MyPageInfoResponse>>
-
-    @Multipart
-    @PATCH("/api/v1/my-page/edit")
-    suspend fun editMyPageInfo(
-        @Part profileImage: MultipartBody.Part?,
-        @Part categories:List<MultipartBody.Part>,
-        @PartMap params:MutableMap<String,RequestBody>
-    ): Response<ResponseBody<CreateHoneyTipResponse>>
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.honeytip.CreateHoneyTipResponse
+import com.umc.ttoklip.data.model.mypage.MyPageInfoResponse
+import okhttp3.MultipartBody
+import okhttp3.RequestBody
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Multipart
+import retrofit2.http.PATCH
+import retrofit2.http.POST
+import retrofit2.http.Part
+import retrofit2.http.PartMap
+
+interface MyPage2Api {
+    @GET("/api/v1/my-page")
+    suspend fun getMyPageInfo(): Response<ResponseBody<MyPageInfoResponse>>
+
+    @Multipart
+    @PATCH("/api/v1/my-page/edit")
+    suspend fun editMyPageInfo(
+        @Part profileImage: MultipartBody.Part?,
+        @Part categories:List<MultipartBody.Part>,
+        @PartMap params:MutableMap<String,RequestBody>
+    ): Response<ResponseBody<CreateHoneyTipResponse>>
 }

app/src/main/java/com/umc/ttoklip/data/api/StrangerApi.kt

@@ -0,0 +1,13 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.stranger.StrangerResponse
+import retrofit2.Response
+import retrofit2.http.POST
+import retrofit2.http.Query
+
+interface StrangerApi {
+    @POST("/api/v1/stranger")
+    suspend fun getStranger(@Query("nickname") nick: String)
+            : Response<ResponseBody<StrangerResponse>>
+}

app/src/main/java/com/umc/ttoklip/data/api/TermApi.kt

@@ -0,0 +1,14 @@
+package com.umc.ttoklip.data.api
+
+import com.umc.ttoklip.data.model.ResponseBody
+import com.umc.ttoklip.data.model.signup.TermResponse
+import retrofit2.Response
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface TermApi {
+    @GET("/api/v1/term")
+    suspend fun getTerm(
+        @Query("page") page: Int)
+            : Response<ResponseBody<TermResponse>>
+}

app/src/main/java/com/umc/ttoklip/data/model/honeytip/HoneyTipPagingResponse.kt

@@ -1,12 +1,12 @@
-package com.umc.ttoklip.data.model.honeytip
-
-data class HoneyTipPagingResponse(
-    val data: List<HoneyTipMain>,
-    val category: String,
-    val totalPage: Int,
-    val totalElements: Int,
-    val isFirst: Boolean,
-    val isLast: Boolean,
-) {
-    constructor(): this(listOf(), "", 0, 0, true, false)
-}
+package com.umc.ttoklip.data.model.honeytip
+
+data class HoneyTipPagingResponse(
+    val data: List<HoneyTipMain>,
+    val category: String,
+    val totalPage: Int,
+    val totalElements: Int,
+    val isFirst: Boolean,
+    val isLast: Boolean,
+) {
+    constructor(): this(listOf(), "", 0, 0, true, false)
+}

app/src/main/java/com/umc/ttoklip/data/model/honeytip/request/HoneyTipCommentRequest.kt

@@ -1,6 +1,6 @@
-package com.umc.ttoklip.data.model.honeytip.request
-
-data class HoneyTipCommentRequest(
-    val comment: String,
-    val parentCommentId: Int
-)
+package com.umc.ttoklip.data.model.honeytip.request
+
+data class HoneyTipCommentRequest(
+    val comment: String,
+    val parentCommentId: Int
+)

app/src/main/java/com/umc/ttoklip/data/model/stranger/StrangerResponse.kt

@@ -0,0 +1,13 @@
+package com.umc.ttoklip.data.model.stranger
+
+data class StrangerResponse (
+    val nickname:String,
+    val residence:String,
+    val level:Int,
+    val experience:ExperienceResponse
+)
+data class ExperienceResponse(
+    val current:Int,
+    val required:Int,
+    val levelimageurl:String
+)

app/src/main/java/com/umc/ttoklip/data/repository/location/DirectLocationRepository.kt

@@ -0,0 +1,8 @@
+package com.umc.ttoklip.data.repository.location
+
+import com.umc.ttoklip.data.model.KakaoResponse
+import retrofit2.Call
+
+interface DirectLocationRepository {
+    suspend fun getDirectAddress(address:String): Call<KakaoResponse.ResultSearchKeyword>
+}

app/src/main/java/com/umc/ttoklip/data/repository/location/DirectLocationRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package com.umc.ttoklip.data.repository.location
+
+import com.umc.ttoklip.R
+import com.umc.ttoklip.data.api.KakaoApi
+import com.umc.ttoklip.data.model.KakaoResponse
+import retrofit2.Call
+import javax.inject.Inject
+
+class DirectLocationRepositoryImpl @Inject constructor(
+    private val api: KakaoApi
+): DirectLocationRepository {
+
+    override suspend fun getDirectAddress(address: String): Call<KakaoResponse.ResultSearchKeyword> {
+        val call = api.getSearchKeyword(R.string.kakao_api_key.toString(), address)
+    return call
+    }
+}

app/src/main/java/com/umc/ttoklip/data/repository/search/Search2Repository.kt

@@ -1,20 +1,20 @@
-package com.umc.ttoklip.data.repository.search
-
-import com.umc.ttoklip.data.model.CommonResponse
-import com.umc.ttoklip.data.model.news.MainNewsResponse
-import com.umc.ttoklip.data.model.news.comment.NewsCommentRequest
-import com.umc.ttoklip.data.model.news.detail.NewsDetailResponse
-import com.umc.ttoklip.data.model.search.NewsSearchResponse
-import com.umc.ttoklip.data.model.search.SearchModel
-import com.umc.ttoklip.data.model.search.TipSearchResponse
-import com.umc.ttoklip.data.model.search.TownSearchResponse
-import com.umc.ttoklip.module.NetworkResult
-
-interface Search2Repository {
-
-    suspend fun getNewsSearch(title : String, sort: String, page: Int): NetworkResult<NewsSearchResponse>
-
-    suspend fun getTipSearch(title : String, sort: String, page: Int): NetworkResult<TipSearchResponse>
-
-    suspend fun getTownSearch(title : String, sort: String, page: Int): NetworkResult<TownSearchResponse>
+package com.umc.ttoklip.data.repository.search
+
+import com.umc.ttoklip.data.model.CommonResponse
+import com.umc.ttoklip.data.model.news.MainNewsResponse
+import com.umc.ttoklip.data.model.news.comment.NewsCommentRequest
+import com.umc.ttoklip.data.model.news.detail.NewsDetailResponse
+import com.umc.ttoklip.data.model.search.NewsSearchResponse
+import com.umc.ttoklip.data.model.search.SearchModel
+import com.umc.ttoklip.data.model.search.TipSearchResponse
+import com.umc.ttoklip.data.model.search.TownSearchResponse
+import com.umc.ttoklip.module.NetworkResult
+
+interface Search2Repository {
+
+    suspend fun getNewsSearch(title : String, sort: String, page: Int): NetworkResult<NewsSearchResponse>
+
+    suspend fun getTipSearch(title : String, sort: String, page: Int): NetworkResult<TipSearchResponse>
+
+    suspend fun getTownSearch(title : String, sort: String, page: Int): NetworkResult<TownSearchResponse>
 }