From cb7703c996a71a0957c993ac49b88e6dd057562c Mon Sep 17 00:00:00 2001
From: moongpom <82695776+moongpom@users.noreply.github.com>
Date: Wed, 24 Aug 2022 18:04:43 +0900
Subject: [PATCH] Revert "Eun"
---
.idea/gradle.xml | 1 +
.idea/misc.xml | 8 +++
.../view/LetterPaper/LetterPaperGVAdapter.kt | 1 +
.../mbtree/view/Login/LoginActivity.kt | 2 -
.../mbtree/view/Login/MbtiGVAdapter.kt | 1 -
.../mbtree/view/Login/NicknameActivity.kt | 2 -
.../project/mbtree/view/tree/TreeResponse.kt | 5 +-
.../project/mbtree/view/user/UserFragment.kt | 68 -------------------
.../project/mbtree/view/user/UserResponse.kt | 19 ------
.../project/mbtree/view/user/UserService.kt | 4 --
10 files changed, 14 insertions(+), 97 deletions(-)
delete mode 100644 app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt
delete mode 100644 app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt
delete mode 100644 app/src/main/java/com/umc/project/mbtree/view/user/UserService.kt
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a8a2961..8241fa0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,6 +8,7 @@
+
@@ -65,6 +72,7 @@
+
diff --git a/app/src/main/java/com/umc/project/mbtree/view/LetterPaper/LetterPaperGVAdapter.kt b/app/src/main/java/com/umc/project/mbtree/view/LetterPaper/LetterPaperGVAdapter.kt
index 59085ac..7f9d911 100644
--- a/app/src/main/java/com/umc/project/mbtree/view/LetterPaper/LetterPaperGVAdapter.kt
+++ b/app/src/main/java/com/umc/project/mbtree/view/LetterPaper/LetterPaperGVAdapter.kt
@@ -14,6 +14,7 @@ import com.umc.project.mbtree.data.LetterPaper
import com.umc.project.mbtree.data.User
import com.umc.project.mbtree.databinding.ItemLetterPaperBinding
import com.umc.project.mbtree.databinding.ItemListBinding
+import com.umc.project.mbtree.view.Login.NicknameActivity
import com.umc.project.mbtree.view.friend.FriendRVAdapter
import kotlinx.android.synthetic.main.item_letter_paper.view.*
import kotlinx.android.synthetic.main.item_mbti.view.*
diff --git a/app/src/main/java/com/umc/project/mbtree/view/Login/LoginActivity.kt b/app/src/main/java/com/umc/project/mbtree/view/Login/LoginActivity.kt
index a0e2af7..60f3079 100644
--- a/app/src/main/java/com/umc/project/mbtree/view/Login/LoginActivity.kt
+++ b/app/src/main/java/com/umc/project/mbtree/view/Login/LoginActivity.kt
@@ -1,4 +1,3 @@
-
package com.umc.project.mbtree.view.Login
import android.content.ContentValues.TAG
@@ -14,7 +13,6 @@ import com.kakao.sdk.common.KakaoSdk
import com.kakao.sdk.common.model.AuthErrorCause
import com.kakao.sdk.user.UserApiClient
import com.umc.project.mbtree.R
-import com.umc.project.mbtree.view.MainActivity
class LoginActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/umc/project/mbtree/view/Login/MbtiGVAdapter.kt b/app/src/main/java/com/umc/project/mbtree/view/Login/MbtiGVAdapter.kt
index 04f198b..065b344 100644
--- a/app/src/main/java/com/umc/project/mbtree/view/Login/MbtiGVAdapter.kt
+++ b/app/src/main/java/com/umc/project/mbtree/view/Login/MbtiGVAdapter.kt
@@ -1,6 +1,5 @@
package com.umc.project.mbtree.view.Login
-
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
diff --git a/app/src/main/java/com/umc/project/mbtree/view/Login/NicknameActivity.kt b/app/src/main/java/com/umc/project/mbtree/view/Login/NicknameActivity.kt
index f7b71c6..a82474f 100644
--- a/app/src/main/java/com/umc/project/mbtree/view/Login/NicknameActivity.kt
+++ b/app/src/main/java/com/umc/project/mbtree/view/Login/NicknameActivity.kt
@@ -1,4 +1,3 @@
-
package com.umc.project.mbtree.view.Login
import android.content.Intent
@@ -25,4 +24,3 @@ class NicknameActivity : AppCompatActivity() {
}
}
-
diff --git a/app/src/main/java/com/umc/project/mbtree/view/tree/TreeResponse.kt b/app/src/main/java/com/umc/project/mbtree/view/tree/TreeResponse.kt
index 5245fd0..d082648 100644
--- a/app/src/main/java/com/umc/project/mbtree/view/tree/TreeResponse.kt
+++ b/app/src/main/java/com/umc/project/mbtree/view/tree/TreeResponse.kt
@@ -10,7 +10,10 @@ data class TreeResponse (
@SerializedName("code") val code: Int,
@SerializedName("message") val message: String,
@SerializedName("result") val result: List
-)
+)/*
+data class TreeResult(
+ @SerializedName("tree") val tree: List
+ )*/
data class Result
(
@SerializedName("id") val id:Int,
diff --git a/app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt b/app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt
deleted file mode 100644
index 3af633e..0000000
--- a/app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.umc.project.mbtree.view.user
-
-import android.os.Bundle
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.Toast
-import androidx.fragment.app.Fragment
-import com.umc.project.mbtree.databinding.ActivityMainBinding.inflate
-import com.umc.project.mbtree.databinding.FragmentFriendBinding
-import com.umc.project.mbtree.databinding.FragmentMyletterBinding
-import com.umc.project.mbtree.databinding.LockerLayoutBinding
-import com.umc.project.mbtree.view.tree.RetrofitObject
-import com.umc.project.mbtree.view.tree.contentResponse
-import com.umc.project.mbtree.view.tree.contentService
-import retrofit2.Call
-import retrofit2.Callback
-import retrofit2.Response
-
-class UserFragment : Fragment() {
-
- lateinit var binding:FragmentMyletterBinding
- override fun onCreateView(
- inflater: LayoutInflater,
- container: ViewGroup?,
- savedInstanceState: Bundle?
- ): View?
- {
-
- binding = FragmentMyletterBinding.inflate(inflater, container,false)
- getMessageId()
- // binding.letterContent.setText(.content)
-
- return binding.root
- }
- private fun getMessageId() {
- Log.v("eun test", "TreeFragment들어옴")
- val retrofitService = RetrofitObject.getRetrofit().create(contentService::class.java)
-
- Log.v("eun test", "retrofitService" + retrofitService.getMessageId(1))
- Log.v("eun test", "TreeFragment들어옴 1")
- retrofitService.getMessageId(1).enqueue(object : Callback {
-
- override fun onResponse(call: Call, response: Response) {
- Log.e("eun test", "TreeFragment들어옴2")
- var rLists = response.body()!!
- Log.e("eun test", "TreeFragment들어옴 3"+rLists)
- Log.d("mbtree test", "isSuccess: " + rLists.isSuccess)
- Log.e("mbtree test", "code: " + rLists.code)
- Log.v("mbtree test", "message: " + rLists.message)
-
- //Expected BEGIN_OBJECT but was STRING
- Log.v("eun test", "은영" + rLists.messageResult)
-
-
- }
-
- override fun onFailure(call: Call, t: Throwable) {
-
- Log.e("eun test", "TreeFragment오류남@@@@@@@@@@")
- Log.d("mbtree test", t.message.toString())
- }
-
- })
-
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt b/app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt
deleted file mode 100644
index 694355e..0000000
--- a/app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.umc.project.mbtree.view.user
-
-
-import com.google.gson.annotations.SerializedName
-import java.time.LocalDateTime
-import java.util.UUID
-
-
-data class TreeResponse (
- @SerializedName("isSuccess") val isSuccess: Boolean,
- @SerializedName("code") val code: Int,
- @SerializedName("message") val message: String,
- @SerializedName("result") val result: User
-)
-data class User
- (
- @SerializedName("id") val id:Int,
- @SerializedName("content") val uuid: String,
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/umc/project/mbtree/view/user/UserService.kt b/app/src/main/java/com/umc/project/mbtree/view/user/UserService.kt
deleted file mode 100644
index f6cd542..0000000
--- a/app/src/main/java/com/umc/project/mbtree/view/user/UserService.kt
+++ /dev/null
@@ -1,4 +0,0 @@
-package com.umc.project.mbtree.view.user
-
-interface UserService {
-}
\ No newline at end of file