Merge pull request #60 from re-Mine/fix-stash2

fix: 코드 리팩토링
re-Mine · Feb 21, 2024 · 4596803 · 4596803
2 parents 94a3ce3 + dbacc34
commit 4596803
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/app/src/main/java/com/remine/retrofit/API.kt b/app/src/main/java/com/remine/retrofit/API.kt
@@ -3,7 +3,7 @@ package com.remine.retrofit
 object API {
     const val BASE_URL : String = "https://www.remine.site:8080/"
 
-    const val AUTH_SIGN_UP : String = "auth/shop-owner/sign-up"
+    const val DECLARATION : String = "/api/v1/declarations"
 
 }
 

diff --git a/app/src/main/java/com/remine/retrofit/IRetrofit.kt b/app/src/main/java/com/remine/retrofit/IRetrofit.kt
@@ -13,17 +13,11 @@ import retrofit2.http.Part
 
 interface IRetrofit {
 
-//    @POST("a")
-//    fun tokenRefresh(@Body refreshTokenArray : String): Call<AuthRes>
-//
-//
-//    // 사장 회원가입
-    @GET("/api/v1/declarations")
+    @GET(API.DECLARATION)
     fun getDeclarations(): Call<DeclarationResponse>
 
     @Multipart
-    @POST("/api/v1/declarations")
+    @POST(API.DECLARATION)
     fun postDeclarations(@Part file: MultipartBody.Part,@Part("content") content: RequestBody): Call<JsonElement>
 
-
 }
diff --git a/app/src/main/java/com/remine/retrofit/RetrofitClient.kt b/app/src/main/java/com/remine/retrofit/RetrofitClient.kt
@@ -115,4 +115,4 @@ class TokenAuthenticator: Authenticator {
             null // 만약 토큰 재발급이 실패했다면 헤더에 아무것도 추가하지 않는다.
         }
     }
-}
+}
diff --git a/app/src/main/java/com/remine/ui/declaration/DeclarationMainFragment.kt b/app/src/main/java/com/remine/ui/declaration/DeclarationMainFragment.kt
@@ -63,16 +63,13 @@ class DeclarationMainFragment : Fragment(), DeclarationAdapter.OnItemClickListen
 
                         binding.tvDeclDescription.text = timeText
 
-                        timeText = SpannableStringBuilder(binding.tvTop.text.toString())
-                        val startIndex2 = 0
-                        val endIndex2 = timeText.indexOf("님")
-                        timeText.replace(startIndex2, endIndex2, result.result.memberName)
-                        binding.tvTop.text = timeText
+//                        timeText = SpannableStringBuilder(binding.tvTop.text.toString())
+//                        val startIndex2 = 0
+//                        val endIndex2 = timeText.indexOf("님")
+//                        timeText.replace(startIndex2, endIndex2, result.result.memberName)
+//                        binding.tvTop.text = timeText
                         setTextColor()
                     }
-//                    Log.d("membername", result.result.memberName + " " + result.result.todayParticipantsCount.toString())
-//                    bundle?.putString("memberName", result.result.memberName)
-//                    bundle?.putInt("participants", result.result.todayParticipantsCount)
 
                     Log.d("retrofit", "DeclarationMainFragment - onCreateView() called / 선언 조회 성공 ${result.toString()}")
                 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,4 +115,4 @@ class TokenAuthenticator: Authenticator { @@
                 null // 만약 토큰 재발급이 실패했다면 헤더에 아무것도 추가하지 않는다.
             }
         }
-    }
+    }