Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

package com.umc.project.mbtree.view.Login

import android.content.ContentValues.TAG
Expand All @@ -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?) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package com.umc.project.mbtree.view.Login


import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

package com.umc.project.mbtree.view.Login

import android.content.Intent
Expand All @@ -25,4 +24,3 @@ class NicknameActivity : AppCompatActivity() {
}
}


Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ data class TreeResponse (
@SerializedName("code") val code: Int,
@SerializedName("message") val message: String,
@SerializedName("result") val result: List<Result>
)
)/*
data class TreeResult(
@SerializedName("tree") val tree: List<Result>
)*/
data class Result
(
@SerializedName("id") val id:Int,
Expand Down
68 changes: 0 additions & 68 deletions app/src/main/java/com/umc/project/mbtree/view/user/UserFragment.kt

This file was deleted.

19 changes: 0 additions & 19 deletions app/src/main/java/com/umc/project/mbtree/view/user/UserResponse.kt

This file was deleted.

This file was deleted.