From f7e40e69509b6dfcfe4e56e7a5f60960ca66c3ee Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 02:57:41 +0900 Subject: [PATCH 01/17] Modify gradle --- app/build.gradle | 2 +- app/src/main/java/com/song2/jeonha/Network/NetworkService.kt | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 41411be..c5af2ab 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,7 +10,7 @@ android { compileSdkVersion 28 defaultConfig { applicationId "com.song2.jeonha" - minSdkVersion 26 + minSdkVersion 24 targetSdkVersion 28 versionCode 1 versionName "1.0" diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 72a400e..80b27e9 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -72,5 +72,7 @@ interface NetworkService { @Body authorization: PostUserSignUp ): Call + + } From fa8cee8b8dc2904c4e7794b4e56fbb251a65417e Mon Sep 17 00:00:00 2001 From: LeeSohee Date: Sun, 29 Sep 2019 03:50:40 +0900 Subject: [PATCH 02/17] Datail to Detail --- app/src/main/java/com/song2/jeonha/Map/MapActivity.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt b/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt index 1b22aab..d8c394a 100644 --- a/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt @@ -18,7 +18,7 @@ import com.google.android.gms.maps.OnMapReadyCallback import com.google.android.gms.maps.SupportMapFragment import com.google.android.gms.maps.model.* import com.song2.jeonha.Class.ClassListActivity -import com.song2.jeonha.Hanok.HanokDatailActivity +import com.song2.jeonha.Hanok.HanokDetailActivity import com.song2.jeonha.Map.data.MapData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetHanokMapResponse @@ -286,10 +286,10 @@ class MapActivity : AppCompatActivity(), OnMapReadyCallback, private fun setOnDetailBtnClickListener(mapDataList: ArrayList, idx: Int) { img_map_act_detail_arrow.setOnClickListener { - startActivity("idx" to mapDataList[idx].hanokIdx) + startActivity("idx" to mapDataList[idx].hanokIdx) } txt_map_act_stay_hanok_name.setOnClickListener { - startActivity("idx" to mapDataList[idx].hanokIdx) + startActivity("idx" to mapDataList[idx].hanokIdx) } } From cba8cbf584a710ad00dae5015d29fbe8fc4eb8aa Mon Sep 17 00:00:00 2001 From: choidaye Date: Sun, 29 Sep 2019 03:54:00 +0900 Subject: [PATCH 03/17] modify login --- .../com/song2/jeonha/Login/LoginActivity.kt | 58 +++++++++++++++++++ .../com/song2/jeonha/Login/SignUpActivity.kt | 10 +++- app/src/main/res/layout/activity_login.xml | 2 + app/src/main/res/layout/activity_sign_up.xml | 15 ++++- 4 files changed, 80 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt b/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt index 97af1a7..a2597dd 100644 --- a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt @@ -1,7 +1,10 @@ package com.song2.jeonha.Login +import android.graphics.Color import android.support.v7.app.AppCompatActivity import android.os.Bundle +import android.text.Editable +import android.text.TextWatcher import android.util.Log import android.widget.Toast import com.song2.jeonha.Main.MainActivity @@ -30,10 +33,62 @@ class LoginActivity : AppCompatActivity() { setOnClickListener() + setTextChangedListenerEmail() + setTextChangedListenerPassword() + + + et_ac_login_id.setOnFocusChangeListener { v, hasFocus -> + if(hasFocus) v_login_id.setBackgroundColor(Color.parseColor("#f3505a")) + else v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) + } + et_ac_login_pw.setOnFocusChangeListener { v, hasFocus -> + + if(hasFocus) v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) + else v_login_pw.setBackgroundColor(Color.parseColor("#2e394a")) + } } + private fun setTextChangedListenerPassword() { + + et_ac_login_pw.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!!.length != 0) { + v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) + + } else { + v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + + } + + private fun setTextChangedListenerEmail() { + et_ac_login_id.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!!.length != 0) { + v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) + } else { + v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + } + private fun setOnClickListener() { btn_ac_login_signin.setOnClickListener { @@ -59,6 +114,9 @@ class LoginActivity : AppCompatActivity() { val input_login_pw: String = et_ac_login_pw.text.toString() + v_login_id.setBackgroundColor(Color.parseColor("#f3505a")) + v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) + val postLoginResponse: Call = networkService.postUserLogin(PostUserLogin(input_login_id, input_login_pw)) postLoginResponse.enqueue(object : Callback { diff --git a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt index 85fc196..9403875 100644 --- a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt @@ -1,5 +1,6 @@ package com.song2.jeonha.Login +import android.graphics.Color import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.util.Log @@ -42,6 +43,7 @@ class SignUpActivity : AppCompatActivity() { + } @@ -62,6 +64,9 @@ class SignUpActivity : AppCompatActivity() { + + + //통신 시작 val postSignUpResponse: Call = networkService.postUserSignUp(PostUserSignUp(input_id, input_pw,input_name,input_phone)) @@ -80,10 +85,11 @@ class SignUpActivity : AppCompatActivity() { response: Response ) { if (response.isSuccessful) { - - startActivity() + finish() + + } else { var message: String = response.body()!!.resMessage Log.e("signup error","회원가입 에러"+message) diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index d5e16a9..c99a749 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -62,6 +62,7 @@ - - + + + + From f2a2a24deb3cb039b0f931705509a1d62144071a Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 04:29:16 +0900 Subject: [PATCH 04/17] Add home_api --- .../com/song2/jeonha/Main/MainActivity.kt | 136 +++++++++++------- .../song2/jeonha/Network/Get/ClassPrograms.kt | 11 ++ .../jeonha/Network/Get/GetMainResponse.kt | 14 ++ .../song2/jeonha/Network/Get/HanokPrograms.kt | 12 ++ .../song2/jeonha/Network/Get/MainPrograms.kt | 6 + .../song2/jeonha/Network/NetworkService.kt | 14 ++ app/src/main/res/layout/activity_main.xml | 42 +++--- .../main/res/layout/item_rv_main_program.xml | 6 +- 8 files changed, 163 insertions(+), 78 deletions(-) create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt index 0c46fd0..2ae072f 100644 --- a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt @@ -13,18 +13,35 @@ import com.song2.jeonha.Class.ClassListActivity import com.google.zxing.integration.android.IntentResult import com.song2.jeonha.Main.Mypage.MypageActivity import com.song2.jeonha.Main.QRcode.QRcodeActivity +import com.song2.jeonha.Network.ApplicationController +import com.song2.jeonha.Network.Get.ClassPrograms +import com.song2.jeonha.Network.Get.GetMainResponse +import com.song2.jeonha.Network.Get.HanokPrograms +import com.song2.jeonha.Network.Get.MainPrograms +import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_main.* +import org.jetbrains.anko.ctx import org.jetbrains.anko.startActivity +import retrofit2.Call +import retrofit2.Response class MainActivity : AppCompatActivity() { + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + lateinit var programListRecyclerViewAdapter: ProgramListRecyclerViewAdapter - var arrayListData : ArrayList = ArrayList() + var arrayListData: ArrayList = ArrayList() + var arrayListClassData: ArrayList = ArrayList() lateinit var titleListRecyclerViewAdapter: TitleListRecyclerViewAdapter - var titleListData : ArrayList = ArrayList() + var titleListData: ArrayList = ArrayList() + + //lateinit var mainProgram: MainPrograms ; + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -42,83 +59,47 @@ class MainActivity : AppCompatActivity() { startActivity() } + getMainProgramsResponse() + setClassProgramRecyclerView(arrayListData) setTitleRecyclerView() - stayRequest() switch_main_main_act_selector.setOnCheckedChangeListener { button, checked -> - if(!checked){ + if (!checked) { //한옥통신 - Log.e("한옥통신", "In "+switch_main_main_act_selector.isChecked) - //switch_main_main_act_selector.toggle() - - stayRequest() - + Log.e("한옥통신", "In " + switch_main_main_act_selector.isChecked) + setClassProgramRecyclerView(arrayListData) iv_main_act_more_btn.setOnClickListener { - //startActivity() + startActivity() } - }else{ + } else { //클래스통신 - Log.e("클래스통신", "In "+switch_main_main_act_selector.isSelected()) - //switch_main_main_act_selector.toggle() + Log.e("클래스통신", "In " + switch_main_main_act_selector.isSelected()) - classRequest() + setClassProgramRecyclerView(arrayListClassData) iv_main_act_more_btn.setOnClickListener { startActivity() } } } - - - } - - fun stayRequest(){ - Log.e("한옥통신", "fun") - - arrayListData.clear() - arrayListData.add(ProgramData(0,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한옥스테이")) - arrayListData.add(ProgramData(1,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","스떼이~~~!")) - arrayListData.add(ProgramData(2,"https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg","한옥한옥")) - arrayListData.add(ProgramData(3,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","하녹하녹")) - arrayListData.add(ProgramData(4,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한옥옥옥ㅇ")) - arrayListData.add(ProgramData(5,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","ㅎ_ㅎ")) - arrayListData.add(ProgramData(6,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한옥")) - - setClassProgramRecyclerView() - } - - fun classRequest(){ - Log.e("클래스통신", "fun") - - arrayListData.clear() - arrayListData.add(ProgramData(0,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기")) - arrayListData.add(ProgramData(1,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험")) - arrayListData.add(ProgramData(2,"https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg","떡메치기")) - arrayListData.add(ProgramData(3,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기")) - arrayListData.add(ProgramData(4,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험")) - arrayListData.add(ProgramData(5,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기")) - arrayListData.add(ProgramData(6,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험")) - - setClassProgramRecyclerView() } - - fun setClassProgramRecyclerView(){ + fun setClassProgramRecyclerView(arrayListData: ArrayList) { programListRecyclerViewAdapter = ProgramListRecyclerViewAdapter(this, arrayListData) programListRecyclerViewAdapter.notifyDataSetChanged() rv_main_act_class_list.adapter = programListRecyclerViewAdapter - rv_main_act_class_list.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL,false) + rv_main_act_class_list.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false) } - fun setTitleRecyclerView(){ - titleListData.add(TitleData(1,"https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg","떡메치기")) - titleListData.add(TitleData(1,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 다리")) - titleListData.add(TitleData(1,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","전통한복 체험")) - titleListData.add(TitleData(1,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","부채춤")) - titleListData.add(TitleData(1,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","부채춤")) + fun setTitleRecyclerView() { + titleListData.add(TitleData(1, "https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg", "떡메치기")) + titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "전통 차 다리")) + titleListData.add(TitleData(1, "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", "전통한복 체험")) + titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "부채춤")) + titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "부채춤")) arrayListData.clear() titleListRecyclerViewAdapter = TitleListRecyclerViewAdapter(this, titleListData) @@ -146,4 +127,49 @@ class MainActivity : AppCompatActivity() { } } + fun getMainProgramsResponse() { + + val getProgramsKeywordResponse = networkService.getMainResponse( + "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZHgiOjEsImlhdCI6MTU2OTIwODA0NSwiZXhwIjoxNTY5ODEyODQ1LCJpc3MiOiJqZW9uaGEyMDE5In0.D9Ao9zBftj5qdd1NL8lSk_--0hPir8Du3tTZs834Afw" + ) + + getProgramsKeywordResponse.enqueue(object : retrofit2.Callback { + override fun onFailure(call: Call, t: Throwable) { + Log.e("getProgramsKeywordResponse fail", t.toString()) + } + + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + if(response.body()!!.status == 200){ + val mainPrograms: MainPrograms = response.body()!!.data + + if (mainPrograms != null) { + settingListData(mainPrograms) + Log.e("mainPrograms success", "test") + } else { + Log.e("mainPrograms success", ":::test") + } + } + } + } + }) + } + + fun settingListData(mainPrograms: MainPrograms) { + + for (i in mainPrograms.hanokList.indices) { + val programData = ProgramData( + mainPrograms.hanokList.get(i).hanokIdx, mainPrograms.hanokList.get(i).thumnail, mainPrograms.hanokList.get(i).name + ); + arrayListData.add(programData) + } + + for (i in mainPrograms.classList.indices) { + val programData = ProgramData( + mainPrograms.classList.get(i).classIdx, mainPrograms.classList.get(i).thumnail, mainPrograms.classList.get(i).name + ); + arrayListClassData.add(programData) + } + } + } diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt b/app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt new file mode 100644 index 0000000..7dbb0e6 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt @@ -0,0 +1,11 @@ +package com.song2.jeonha.Network.Get + +class ClassPrograms( + val classIdx: Int, + val name: String, + val type: String, + val place: String, + val address: String, + val writetime: String, + val thumnail: String +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt new file mode 100644 index 0000000..62de303 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt @@ -0,0 +1,14 @@ +package com.song2.jeonha.Network.Get + +import com.song2.jeonha.Map.data.MapData + +class GetMainResponse( + val success: Boolean, + val status: Int, + val resMessage: String, + val data: MainPrograms +) + + + + diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt b/app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt new file mode 100644 index 0000000..d76da69 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt @@ -0,0 +1,12 @@ +package com.song2.jeonha.Network.Get + + +class HanokPrograms( + val hanokIdx: Int, + val name: String, + val type: String, + val place: String, + val address: String, + val writetime: String, + val thumnail: String +) diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt new file mode 100644 index 0000000..a493150 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt @@ -0,0 +1,6 @@ +package com.song2.jeonha.Network.Get + +class MainPrograms( + val hanokList: ArrayList, + val classList: ArrayList +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 911e681..4bc138a 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -5,6 +5,7 @@ import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingCl import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse import com.song2.jeonha.Network.Get.GetHanokListResponse import com.song2.jeonha.Network.Get.GetHanokMapResponse +import com.song2.jeonha.Network.Get.GetMainResponse import com.song2.jeonha.Network.Get.GetStampResponse import com.song2.jeonha.Network.Post.PostUserLogin import com.song2.jeonha.Network.Post.PostUserSignUp @@ -73,6 +74,19 @@ interface NetworkService { ): Call + //GET + @GET("/main") + fun getMainResponse( + @Header("authorization") token: String + ): Call +/* + + @GET("/class") + fun getaClassListResponse( + @Header("authorization") token: String, + @Query ("day") sort : Int + ): Call +*/ } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7f667d7..be5c83d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -13,19 +13,19 @@ android:padding="12dp" android:src="@drawable/qr_icon"/> - - - + + + @@ -53,22 +53,22 @@ android:layout_width="wrap_content" android:layout_height="100dp" android:layout_below="@+id/switch_main_main_act_selector" - android:scrollbars="none" - android:layout_marginTop="20.5dp"> + android:layout_marginTop="20.5dp" + android:scrollbars="none"> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="32dp" android:src="@drawable/btn_more"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@+id/switch_main_main_act_selector" android:layout_toRightOf="@+id/scr"> diff --git a/app/src/main/res/layout/item_rv_main_program.xml b/app/src/main/res/layout/item_rv_main_program.xml index ffe6e8d..19ec23c 100644 --- a/app/src/main/res/layout/item_rv_main_program.xml +++ b/app/src/main/res/layout/item_rv_main_program.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/rv_item_main_program_list_container" - android:layout_width="wrap_content" android:layout_height="99dp" + android:layout_width="90dp" android:layout_height="99dp" android:layout_marginStart="8dp"> From d2d790bc9f2a8baa1ee9665c43cada0e6bb81957 Mon Sep 17 00:00:00 2001 From: LeeSohee Date: Sun, 29 Sep 2019 05:33:41 +0900 Subject: [PATCH 05/17] =?UTF-8?q?=20=ED=86=B5?= =?UTF-8?q?=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../song2/jeonha/Hanok/HanokDetailActivity.kt | 86 ++++++++++++++++++- .../jeonha/Hanok/data/HanokDetailItem.kt | 15 ++++ .../com/song2/jeonha/Hanok/data/PhotoItem.kt | 5 ++ .../java/com/song2/jeonha/Map/MapActivity.kt | 5 +- .../Network/Get/GetHanokDetailResponse.kt | 10 +++ .../song2/jeonha/Network/NetworkService.kt | 13 +++ .../main/res/layout/activity_hanok_detail.xml | 8 ++ 7 files changed, 135 insertions(+), 7 deletions(-) create mode 100644 app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt create mode 100644 app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt index 666ea47..7e9ef2e 100644 --- a/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt @@ -3,20 +3,50 @@ package com.song2.jeonha.Hanok import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.support.v7.widget.LinearLayoutManager +import android.util.Log +import com.google.android.gms.maps.CameraUpdateFactory +import com.google.android.gms.maps.GoogleMap +import com.google.android.gms.maps.OnMapReadyCallback +import com.google.android.gms.maps.SupportMapFragment +import com.google.android.gms.maps.model.BitmapDescriptorFactory +import com.google.android.gms.maps.model.LatLng +import com.google.android.gms.maps.model.MarkerOptions +import com.song2.jeonha.Hanok.data.HanokDetailItem import com.song2.jeonha.Hanok.data.Rooms +import com.song2.jeonha.Network.ApplicationController +import com.song2.jeonha.Network.Get.GetHanokDetailResponse +import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_hanok_detail.* +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response -class HanokDetailActivity : AppCompatActivity() { +class HanokDetailActivity : AppCompatActivity(), OnMapReadyCallback { + + val TAG = "HanokDetailActivity TAG" + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + var hanokIdx: Int? = null + + var mMap: GoogleMap? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_hanok_detail) + hanokIdx = intent.getIntExtra("idx", -1) + getMap() + setRecyclerView() + } - //추천 리사이클러뷰 - var roomsList : ArrayList = ArrayList() + private fun setRecyclerView() { + //추천 리싸이클러뷰 + var roomsList: ArrayList = ArrayList() roomsList.add(Rooms("싱클룸", 1, 2)) roomsList.add(Rooms("트리플", 1, 2)) roomsList.add(Rooms("기타", 1, 2)) @@ -25,16 +55,64 @@ class HanokDetailActivity : AppCompatActivity() { var hanOkRecyclcerViewAdapter = HanOkRecyclcerViewAdapter(this, roomsList) rv_ac_hanok_detail_room.adapter = hanOkRecyclcerViewAdapter - rv_ac_hanok_detail_room.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false) + rv_ac_hanok_detail_room.layoutManager = + LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false) + } + private fun getHanokDetailResponse(idx: Int) { + val getHanokDetailResponse = networkService.getHanokDetailResponse("application/json", idx) + getHanokDetailResponse.enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { + Log.e("HanokDetail Fail", t.toString()) + } + + override fun onResponse( + call: Call, + response: Response + ) { + if (response.isSuccessful) { + if (response.body()!!.status == 200) { + val items: HanokDetailItem = response.body()!!.data + Log.d(TAG, items.toString()) + + setContent(items) + } + } + } + }) + } + private fun setContent(items: HanokDetailItem) { + val location = LatLng(items.latitude, items.longitude) + if (mMap != null) addMarker(mMap, location) + } + private fun getMap() { + val mapFragment = supportFragmentManager + .findFragmentById(R.id.frag_detail_map) as SupportMapFragment? + mapFragment!!.getMapAsync(this) } + override fun onMapReady(googleMap: GoogleMap?) { + Log.d(TAG, "onMapReady()") + mMap = googleMap + if (hanokIdx != -1 && hanokIdx != null) getHanokDetailResponse(hanokIdx!!) + } + private fun addMarker(mMap: GoogleMap?, location: LatLng) { + val markerOptions = MarkerOptions().let { + it.position(location) + .icon(BitmapDescriptorFactory.fromResource(R.drawable.location_icon_big)) + } + mMap?.let { + it.addMarker(markerOptions) + it.moveCamera(CameraUpdateFactory.newLatLng(location)) + it.animateCamera(CameraUpdateFactory.zoomTo(10f)) + } + } } diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt b/app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt new file mode 100644 index 0000000..be4552a --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt @@ -0,0 +1,15 @@ +package com.song2.jeonha.Hanok.data + +data class HanokDetailItem( + val hanokIdx: Int, + val name: String, + val type: String, + val place: String, + val latitude: Double, + val longitude: Double, + val address: String, + val detail: String, + val option: String, + val transport: String, + val img: ArrayList +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt b/app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt new file mode 100644 index 0000000..b7c1701 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt @@ -0,0 +1,5 @@ +package com.song2.jeonha.Hanok.data + +data class PhotoItem( + val img : String +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt b/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt index d8c394a..88152a5 100644 --- a/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt @@ -109,7 +109,7 @@ class MapActivity : AppCompatActivity(), OnMapReadyCallback, mMap!!.addMarker(markerOptions) mMap!!.moveCamera(CameraUpdateFactory.newLatLng(currentLatLng)) - mMap!!.animateCamera(CameraUpdateFactory.zoomTo(5f)) + mMap!!.animateCamera(CameraUpdateFactory.zoomTo(13f)) } private fun getPermission() { @@ -273,12 +273,11 @@ class MapActivity : AppCompatActivity(), OnMapReadyCallback, markerList!![i].tag = markerList!![i] == it if (markerList!![i].tag == true) idx = i - Log.v("마커 클릭 ", i.toString() + " 는 " + markerList!![i].tag) } setOnDetailBtnClickListener(mapDataList, idx) - setHanokDetailView(idx, mapDataList) + if(idx != -1) setHanokDetailView(idx, mapDataList) return@setOnMarkerClickListener false } diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt new file mode 100644 index 0000000..d831d07 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt @@ -0,0 +1,10 @@ +package com.song2.jeonha.Network.Get + +import com.song2.jeonha.Hanok.data.HanokDetailItem + +class GetHanokDetailResponse( + val success : Boolean, + val status : Int, + val resMessage: String, + val data : HanokDetailItem + ) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 7544a19..598bb74 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -3,6 +3,7 @@ package com.song2.jeonha.Network import com.google.gson.JsonObject import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse +import com.song2.jeonha.Network.Get.GetHanokDetailResponse import com.song2.jeonha.Network.Get.GetHanokListResponse import com.song2.jeonha.Network.Get.GetHanokMapResponse import com.song2.jeonha.Network.Get.GetStampResponse @@ -40,6 +41,18 @@ interface NetworkService { @Query("sort") sort: Int ): Call + /** + * 소희 + * 한옥디테일 + */ + @GET("/hanok/{hanokIdx}") + fun getHanokDetailResponse( + @Header("Content-Type") content_type: String, + @Path("hanokIdx") hanokIdx: Int + ): Call + + + //스탬프 조회 @GET("/user/stamp") fun getStampResponse( diff --git a/app/src/main/res/layout/activity_hanok_detail.xml b/app/src/main/res/layout/activity_hanok_detail.xml index 9ccb59c..0e4444d 100644 --- a/app/src/main/res/layout/activity_hanok_detail.xml +++ b/app/src/main/res/layout/activity_hanok_detail.xml @@ -254,6 +254,14 @@ android:layout_marginTop="4dp" android:text="서울시 종로구 체부동 147-1"/> + + Date: Sun, 29 Sep 2019 06:06:03 +0900 Subject: [PATCH 06/17] Add class_list_api --- .../song2/jeonha/Class/ClassListActivity.kt | 65 ++++++++++++------- .../Class/ClassListRecyclerViewAdapter.kt | 13 ++-- .../GetMyBookingList/ClassListItemData.kt | 10 +++ .../Network/Get/GetClassListResponse.kt | 10 +++ .../song2/jeonha/Network/NetworkService.kt | 12 +--- 5 files changed, 74 insertions(+), 36 deletions(-) create mode 100644 app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt index 89f548d..23bfdb1 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt @@ -3,31 +3,34 @@ package com.song2.jeonha.Class import android.app.Dialog import android.support.v7.app.AppCompatActivity import android.os.Bundle -import android.support.v7.app.AlertDialog import android.support.v7.widget.LinearLayoutManager +import android.util.Log import android.view.Window import android.widget.RadioButton import android.widget.RelativeLayout import android.widget.TextView -import android.widget.Toast -import com.song2.jeonha.Main.ProgramData -import com.song2.jeonha.Main.ProgramListRecyclerViewAdapter +import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import com.song2.jeonha.Network.ApplicationController +import com.song2.jeonha.Network.Get.GetClassListResponse +import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_class_list.* -import kotlinx.android.synthetic.main.activity_main.* -import org.jetbrains.anko.ctx +import retrofit2.Call +import retrofit2.Response class ClassListActivity : AppCompatActivity() { + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } lateinit var classListRecyclerViewAdapter: ClassListRecyclerViewAdapter - var arrayListData : ArrayList = ArrayList() override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_class_list) - setClassRecyclerView() + getClassListResponse(0) iv_class_list_act_filter_btn.setOnClickListener { clickFilterBtn() @@ -63,25 +66,43 @@ class ClassListActivity : AppCompatActivity() { } } - fun setClassRecyclerView(){ - - var day : ArrayList = ArrayList() - day.add("월요일") - day.add("화요일") - day.add("수요일") + fun setClassRecyclerView(data: ArrayList){ - arrayListData.add(ClassData(0,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(1,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) - arrayListData.add(ClassData(2,"https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg","떡메치기", day)) - arrayListData.add(ClassData(3,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(4,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) - arrayListData.add(ClassData(5,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(6,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) + Log.e("getProgramsKeywordResponse ㅅㅂㅅㅂ", data.size.toString()) - classListRecyclerViewAdapter = ClassListRecyclerViewAdapter(this, arrayListData) + classListRecyclerViewAdapter = ClassListRecyclerViewAdapter(this, data) rv_class_list_act_list.adapter = classListRecyclerViewAdapter + classListRecyclerViewAdapter.notifyDataSetChanged() rv_class_list_act_list.layoutManager = LinearLayoutManager(this) } + + fun getClassListResponse(day : Int) { + + val getClassListResponse = networkService.getClassListResponse(day) + + getClassListResponse.enqueue(object : retrofit2.Callback { + override fun onFailure(call: Call, t: Throwable) { + Log.e("getProgramsKeywordResponse fail", t.toString()) + } + + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + val responseData: GetClassListResponse = response.body()!! + + if (responseData.data.size > 0) { + for (i in responseData.data.indices) + Log.e("classList success", "test"+responseData.data[i].weekday) + + setClassRecyclerView(responseData.data) + + } else { + Log.e("classList success", ":::test") + } + + } + } + }) + } } diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt index f2145a2..7db0cbb 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt @@ -11,11 +11,12 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide +import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import com.song2.jeonha.R import de.hdodenhof.circleimageview.CircleImageView -class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { +class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { var CLASSIDX = "classIDX" @@ -32,25 +33,27 @@ class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList() } + var store_day = dataList[position].weekday.split(" ") as ArrayList + var test = "" - for (i in 0..dataList[position].day!!.size-1){ + for (i in 0..store_day.size-1){ if(i !=0) test +="·" - test += dataList[position].day!![i] + test += store_day[i] } holder.classDay.text = test Glide.with(ctx) - .load(dataList[position].class_img) + .load(dataList[position].img) .into(holder.classImg) holder.classImg.setColorFilter(Color.parseColor("#BDBDBD"), PorterDuff.Mode.MULTIPLY); diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt new file mode 100644 index 0000000..ff01e10 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt @@ -0,0 +1,10 @@ +package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList + +data class ClassListItemData( + val classIdx: Int, + val name: String, + val weekday: String, + val time: String, + val weekIdx: Int, + val img: String? +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt new file mode 100644 index 0000000..6d65912 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt @@ -0,0 +1,10 @@ +package com.song2.jeonha.Network.Get + +import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData + +class GetClassListResponse( + val success: Boolean, + val status: Long, + val resMessage: String, + val data: ArrayList +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 4bc138a..6e69b42 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -3,10 +3,7 @@ package com.song2.jeonha.Network import com.google.gson.JsonObject import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse -import com.song2.jeonha.Network.Get.GetHanokListResponse -import com.song2.jeonha.Network.Get.GetHanokMapResponse -import com.song2.jeonha.Network.Get.GetMainResponse -import com.song2.jeonha.Network.Get.GetStampResponse +import com.song2.jeonha.Network.Get.* import com.song2.jeonha.Network.Post.PostUserLogin import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse @@ -79,14 +76,11 @@ interface NetworkService { fun getMainResponse( @Header("authorization") token: String ): Call -/* @GET("/class") - fun getaClassListResponse( - @Header("authorization") token: String, - @Query ("day") sort : Int + fun getClassListResponse( + @Query ("day") day : Int ): Call -*/ } From b685a29cd57a7c7360af6818697bd9ee7001d26e Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 16:17:22 +0900 Subject: [PATCH 07/17] Fordering & Add class_detail_api --- .../song2/jeonha/Class/ClassDetailActivity.kt | 81 ++++++ .../song2/jeonha/Class/ClassListActivity.kt | 71 +++++- .../ClassBookDateRecyclerViewAdapter.kt | 45 ++++ .../ClassListRecyclerViewAdapter.kt | 13 +- .../jeonha/Class/{ => data}/ClassData.kt | 2 +- .../jeonha/Class/data/ClassDetailedData.kt | 13 + .../com/song2/jeonha/Class/data/ImgData.kt | 7 + .../song2/jeonha/Class/data/ScheduleData.kt | 8 + .../com/song2/jeonha/Main/MainActivity.kt | 78 ++++-- .../ClassBookingRecyclerViewAdapter.kt | 2 - .../Mypage/MyPageFragment/ClassFragment.kt | 3 - .../ProgramListRecyclerViewAdapter.kt | 3 +- .../TitleListRecyclerViewAdapter.kt | 13 +- .../Get => Main/data}/ClassPrograms.kt | 2 +- .../Get => Main/data}/HanokPrograms.kt | 2 +- .../song2/jeonha/Main/data/MainPrograms.kt | 9 + .../jeonha/Main/{ => data}/ProgramData.kt | 2 +- .../song2/jeonha/Main/{ => data}/TitleData.kt | 2 +- .../Network/Get/GetClassDetailResponse.kt | 10 + .../jeonha/Network/Get/GetMainResponse.kt | 2 +- .../song2/jeonha/Network/Get/MainPrograms.kt | 6 - .../song2/jeonha/Network/NetworkService.kt | 22 +- .../main/res/layout/activity_class_detail.xml | 234 ++++++++++++++++++ .../main/res/layout/item_rv_class_date.xml | 35 +++ 24 files changed, 584 insertions(+), 81 deletions(-) create mode 100644 app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt create mode 100644 app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt rename app/src/main/java/com/song2/jeonha/Class/{ => adapter}/ClassListRecyclerViewAdapter.kt (86%) rename app/src/main/java/com/song2/jeonha/Class/{ => data}/ClassData.kt (78%) create mode 100644 app/src/main/java/com/song2/jeonha/Class/data/ClassDetailedData.kt create mode 100644 app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt create mode 100644 app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt rename app/src/main/java/com/song2/jeonha/Main/{ => adapter}/ProgramListRecyclerViewAdapter.kt (94%) rename app/src/main/java/com/song2/jeonha/Main/{ => adapter}/TitleListRecyclerViewAdapter.kt (76%) rename app/src/main/java/com/song2/jeonha/{Network/Get => Main/data}/ClassPrograms.kt (83%) rename app/src/main/java/com/song2/jeonha/{Network/Get => Main/data}/HanokPrograms.kt (83%) create mode 100644 app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt rename app/src/main/java/com/song2/jeonha/Main/{ => data}/ProgramData.kt (74%) rename app/src/main/java/com/song2/jeonha/Main/{ => data}/TitleData.kt (73%) create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt delete mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt create mode 100644 app/src/main/res/layout/activity_class_detail.xml create mode 100644 app/src/main/res/layout/item_rv_class_date.xml diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt b/app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt new file mode 100644 index 0000000..4e481d1 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt @@ -0,0 +1,81 @@ +package com.song2.jeonha.Class + +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager +import android.util.Log +import com.song2.jeonha.Class.adapter.ClassBookDateRecyclerViewAdapter +import com.song2.jeonha.Class.data.ClassDetailedData +import com.song2.jeonha.Network.ApplicationController +import com.song2.jeonha.Network.Get.GetClassDetailResponse +import com.song2.jeonha.Network.NetworkService +import com.song2.jeonha.R +import kotlinx.android.synthetic.main.activity_class_detail.* +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class ClassDetailActivity : AppCompatActivity() { + + val TAG = "ClassDetailActivity TAG" + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + lateinit var classBookDateRecyclerViewAdapter: ClassBookDateRecyclerViewAdapter + + var classIdx: Int? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_class_detail) + + classIdx = intent.getIntExtra("idx", -1) + getClassDetailResponse(2!!) + + //getClassDetailResponse(classIdx!!) + } + + private fun getClassDetailResponse(idx: Int) { + val getClassDetailResponse = networkService.getClassDetailResponse(idx) + getClassDetailResponse.enqueue(object : Callback { + override fun onFailure(call: Call, t: Throwable) { + Log.e("ClassDetail Fail", t.toString()) + } + + override fun onResponse(call: Call, response: Response) { + if (response.isSuccessful) { + if (response.body()!!.status == 200) { + val items: ClassDetailedData = response.body()!!.data + Log.d(TAG, items.toString()) + setContent(items) + } + } + } + + }) + } + + private fun setContent(items: ClassDetailedData) { + + var str = "" + for(i in items.schedule.indices){ + if(i !=0) + str+="·" + str += items.schedule.get(i).weekday + } + + tv_class_detail_act_day.setText(str) + tv_class_detail_act_name.setText(items.name) + tv_class_detail_act_info.setText(items.detail) + tv_class_detail_act_address.setText(items.address) + + classBookDateRecyclerViewAdapter = ClassBookDateRecyclerViewAdapter(this, items.schedule) + rv_class_detail_act_time.adapter = classBookDateRecyclerViewAdapter + rv_class_detail_act_time.layoutManager = LinearLayoutManager(this) + } + + + +} diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt index 89f548d..4095bc0 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt @@ -3,19 +3,15 @@ package com.song2.jeonha.Class import android.app.Dialog import android.support.v7.app.AppCompatActivity import android.os.Bundle -import android.support.v7.app.AlertDialog import android.support.v7.widget.LinearLayoutManager import android.view.Window import android.widget.RadioButton import android.widget.RelativeLayout import android.widget.TextView -import android.widget.Toast -import com.song2.jeonha.Main.ProgramData -import com.song2.jeonha.Main.ProgramListRecyclerViewAdapter +import com.song2.jeonha.Class.adapter.ClassListRecyclerViewAdapter +import com.song2.jeonha.Class.data.ClassData import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_class_list.* -import kotlinx.android.synthetic.main.activity_main.* -import org.jetbrains.anko.ctx class ClassListActivity : AppCompatActivity() { @@ -71,13 +67,62 @@ class ClassListActivity : AppCompatActivity() { day.add("화요일") day.add("수요일") - arrayListData.add(ClassData(0,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(1,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) - arrayListData.add(ClassData(2,"https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg","떡메치기", day)) - arrayListData.add(ClassData(3,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(4,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) - arrayListData.add(ClassData(5,"https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75","전통 차 만들기", day)) - arrayListData.add(ClassData(6,"https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg","한복 체험", day)) + arrayListData.add( + ClassData( + 0, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "전통 차 만들기", + day + ) + ) + arrayListData.add( + ClassData( + 1, + "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", + "한복 체험", + day + ) + ) + arrayListData.add( + ClassData( + 2, + "https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg", + "떡메치기", + day + ) + ) + arrayListData.add( + ClassData( + 3, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "전통 차 만들기", + day + ) + ) + arrayListData.add( + ClassData( + 4, + "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", + "한복 체험", + day + ) + ) + arrayListData.add( + ClassData( + 5, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "전통 차 만들기", + day + ) + ) + arrayListData.add( + ClassData( + 6, + "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", + "한복 체험", + day + ) + ) classListRecyclerViewAdapter = ClassListRecyclerViewAdapter(this, arrayListData) rv_class_list_act_list.adapter = classListRecyclerViewAdapter diff --git a/app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt new file mode 100644 index 0000000..c160f1f --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt @@ -0,0 +1,45 @@ +package com.song2.jeonha.Class.adapter + +import android.content.Context +import android.graphics.Color +import android.graphics.PorterDuff +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.ImageView +import android.widget.RelativeLayout +import android.widget.TextView +import com.bumptech.glide.Glide +import com.song2.jeonha.Class.ClassDetailActivity +import com.song2.jeonha.Class.data.ClassData +import com.song2.jeonha.Class.data.ScheduleData +import com.song2.jeonha.R +import org.jetbrains.anko.startActivity + + +class ClassBookDateRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { + + override fun onCreateViewHolder(viewgroup: ViewGroup, position: Int): Holder { + + var view : View = LayoutInflater.from(ctx).inflate(R.layout.item_rv_class_date, viewgroup, false) + + return Holder(view) + } + + override fun getItemCount(): Int { + return dataList.size + } + + override fun onBindViewHolder(holder: Holder, position: Int) { + + holder.weekday.text = dataList[position].weekday + holder.time.text = dataList[position].time + } + + inner class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) { + var weekday = itemView.findViewById(R.id.tv_item_class_date_weekday) as TextView + var time = itemView.findViewById(R.id.tv_item_class_date_time) as TextView + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Class/adapter/ClassListRecyclerViewAdapter.kt similarity index 86% rename from app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/Class/adapter/ClassListRecyclerViewAdapter.kt index f2145a2..7eb787b 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/Class/adapter/ClassListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class +package com.song2.jeonha.Class.adapter import android.content.Context import android.graphics.Color @@ -11,14 +11,14 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide +import com.song2.jeonha.Class.ClassDetailActivity +import com.song2.jeonha.Class.data.ClassData import com.song2.jeonha.R -import de.hdodenhof.circleimageview.CircleImageView +import org.jetbrains.anko.startActivity class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { - var CLASSIDX = "classIDX" - override fun onCreateViewHolder(viewgroup: ViewGroup, position: Int): Holder { var view : View = LayoutInflater.from(ctx).inflate(R.layout.item_rv_class, viewgroup, false) @@ -35,8 +35,7 @@ class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList() + ctx.startActivity("idx" to dataList[position].id) } var test = "" @@ -53,7 +52,7 @@ class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList, + val schedule: ArrayList +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt b/app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt new file mode 100644 index 0000000..0c496a8 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt @@ -0,0 +1,7 @@ +package com.song2.jeonha.Class.data + +class ImgData( + val ciIdx: Int, + val img: String, + val classIdx: Int +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt b/app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt new file mode 100644 index 0000000..148db2a --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt @@ -0,0 +1,8 @@ +package com.song2.jeonha.Class.data + +class ScheduleData( + val weekIdx: Int, + val weekday: String, + val time: String, + val classIdx: Int +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt index 2ae072f..5f3f1c5 100644 --- a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt @@ -1,7 +1,6 @@ package com.song2.jeonha.Main import android.app.Activity -import android.content.AbstractThreadedSyncAdapter import android.content.Intent import android.support.v7.app.AppCompatActivity import android.os.Bundle @@ -10,18 +9,18 @@ import android.util.Log import android.widget.Toast import com.google.zxing.integration.android.IntentIntegrator import com.song2.jeonha.Class.ClassListActivity -import com.google.zxing.integration.android.IntentResult import com.song2.jeonha.Main.Mypage.MypageActivity import com.song2.jeonha.Main.QRcode.QRcodeActivity +import com.song2.jeonha.Main.adapter.ProgramListRecyclerViewAdapter +import com.song2.jeonha.Main.adapter.TitleListRecyclerViewAdapter +import com.song2.jeonha.Main.data.ProgramData +import com.song2.jeonha.Main.data.TitleData import com.song2.jeonha.Network.ApplicationController -import com.song2.jeonha.Network.Get.ClassPrograms import com.song2.jeonha.Network.Get.GetMainResponse -import com.song2.jeonha.Network.Get.HanokPrograms -import com.song2.jeonha.Network.Get.MainPrograms +import com.song2.jeonha.Main.data.MainPrograms import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_main.* -import org.jetbrains.anko.ctx import org.jetbrains.anko.startActivity import retrofit2.Call @@ -66,7 +65,7 @@ class MainActivity : AppCompatActivity() { switch_main_main_act_selector.setOnCheckedChangeListener { button, checked -> if (!checked) { //한옥통신 - Log.e("한옥통신", "In " + switch_main_main_act_selector.isChecked) + Log.e("한옥통신", "In " + switch_main_main_act_selector.isSelected()) setClassProgramRecyclerView(arrayListData) iv_main_act_more_btn.setOnClickListener { startActivity() @@ -87,6 +86,9 @@ class MainActivity : AppCompatActivity() { fun setClassProgramRecyclerView(arrayListData: ArrayList) { + Log.e("리사이클러뷰 Data", ":::confirm"+arrayListData.size) + + programListRecyclerViewAdapter = ProgramListRecyclerViewAdapter(this, arrayListData) programListRecyclerViewAdapter.notifyDataSetChanged() rv_main_act_class_list.adapter = programListRecyclerViewAdapter @@ -95,11 +97,41 @@ class MainActivity : AppCompatActivity() { } fun setTitleRecyclerView() { - titleListData.add(TitleData(1, "https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg", "떡메치기")) - titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "전통 차 다리")) - titleListData.add(TitleData(1, "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", "전통한복 체험")) - titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "부채춤")) - titleListData.add(TitleData(1, "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", "부채춤")) + titleListData.add( + TitleData( + 1, + "https://file2.nocutnews.co.kr/newsroom/image/2011/09/07170436417004_61000040.jpg", + "떡메치기" + ) + ) + titleListData.add( + TitleData( + 1, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "전통 차 다리" + ) + ) + titleListData.add( + TitleData( + 1, + "https://res.klook.com/images/fl_lossy.progressive,q_65/c_fill,w_1295,h_720,f_auto/w_80,x_15,y_15,g_south_west,l_klook_water/activities/cpdq3jxrnhdmjvow79qs/.jpg", + "전통한복 체험" + ) + ) + titleListData.add( + TitleData( + 1, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "부채춤" + ) + ) + titleListData.add( + TitleData( + 1, + "https://post-phinf.pstatic.net/MjAxNzA5MjBfMTAx/MDAxNTA1ODc3OTc0NDEz.Kvi6RAECepI8fweR4ddrgFEdRJzU2KC-WLmFRTmuSEEg.BkaL2u6ZTT-wn7agPveSnOYSwxodVIeKzUc_pL5PRrgg.JPEG/trd032tg13012.jpg?type=w800_q75", + "부채춤" + ) + ) arrayListData.clear() titleListRecyclerViewAdapter = TitleListRecyclerViewAdapter(this, titleListData) @@ -149,8 +181,11 @@ class MainActivity : AppCompatActivity() { } else { Log.e("mainPrograms success", ":::test") } - } - } + }else + Log.e("mainPrograms test", ":::test") + }else + Log.e("mainPrograms fail", ":::test") + } }) } @@ -159,16 +194,23 @@ class MainActivity : AppCompatActivity() { for (i in mainPrograms.hanokList.indices) { val programData = ProgramData( - mainPrograms.hanokList.get(i).hanokIdx, mainPrograms.hanokList.get(i).thumnail, mainPrograms.hanokList.get(i).name - ); + mainPrograms.hanokList.get(i).hanokIdx, + mainPrograms.hanokList.get(i).thumnail, + mainPrograms.hanokList.get(i).name + ) arrayListData.add(programData) + Log.e("hanokList Data", ":::confirm") + } for (i in mainPrograms.classList.indices) { val programData = ProgramData( - mainPrograms.classList.get(i).classIdx, mainPrograms.classList.get(i).thumnail, mainPrograms.classList.get(i).name - ); + mainPrograms.classList.get(i).classIdx, + mainPrograms.classList.get(i).thumnail, + mainPrograms.classList.get(i).name + ) arrayListClassData.add(programData) + Log.e("classList Data", ":::confirm") } } diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt index cedc07b..573cc71 100644 --- a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt @@ -10,9 +10,7 @@ import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData -import com.song2.jeonha.Main.ProgramData import com.song2.jeonha.R -import de.hdodenhof.circleimageview.CircleImageView class ClassBookingRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt index f0069ed..d159837 100644 --- a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt +++ b/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt @@ -10,15 +10,12 @@ import android.view.View import android.view.ViewGroup import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse -import com.song2.jeonha.Main.ProgramData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.fragment_class.* import org.jetbrains.anko.support.v4.ctx -import org.jetbrains.anko.support.v4.toast import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/song2/jeonha/Main/ProgramListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Main/adapter/ProgramListRecyclerViewAdapter.kt similarity index 94% rename from app/src/main/java/com/song2/jeonha/Main/ProgramListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/Main/adapter/ProgramListRecyclerViewAdapter.kt index 1ee5934..a3edb8c 100644 --- a/app/src/main/java/com/song2/jeonha/Main/ProgramListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/Main/adapter/ProgramListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.Main.adapter import android.content.Context import android.support.v7.widget.RecyclerView @@ -8,6 +8,7 @@ import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide +import com.song2.jeonha.Main.data.ProgramData import com.song2.jeonha.R import de.hdodenhof.circleimageview.CircleImageView diff --git a/app/src/main/java/com/song2/jeonha/Main/TitleListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/Main/adapter/TitleListRecyclerViewAdapter.kt similarity index 76% rename from app/src/main/java/com/song2/jeonha/Main/TitleListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/Main/adapter/TitleListRecyclerViewAdapter.kt index c7d4c9d..0dfcdbd 100644 --- a/app/src/main/java/com/song2/jeonha/Main/TitleListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/Main/adapter/TitleListRecyclerViewAdapter.kt @@ -1,9 +1,7 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.Main.adapter import android.content.Context -import android.graphics.Bitmap import android.graphics.Color -import android.graphics.ColorFilter import android.graphics.PorterDuff import android.support.v7.widget.RecyclerView import android.view.LayoutInflater @@ -13,17 +11,10 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool -import com.bumptech.glide.load.engine.prefill.BitmapPreFiller -import com.bumptech.glide.load.resource.bitmap.BitmapDrawableDecoder -import com.bumptech.glide.load.resource.bitmap.CenterCrop -import com.bumptech.glide.load.resource.bitmap.CircleCrop import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions +import com.song2.jeonha.Main.data.TitleData import com.song2.jeonha.R -import de.hdodenhof.circleimageview.CircleImageView -import jp.wasabeef.glide.transformations.BlurTransformation -import jp.wasabeef.glide.transformations.ColorFilterTransformation class TitleListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt b/app/src/main/java/com/song2/jeonha/Main/data/ClassPrograms.kt similarity index 83% rename from app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt rename to app/src/main/java/com/song2/jeonha/Main/data/ClassPrograms.kt index 7dbb0e6..2abfb91 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/ClassPrograms.kt +++ b/app/src/main/java/com/song2/jeonha/Main/data/ClassPrograms.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Network.Get +package com.song2.jeonha.Main.data class ClassPrograms( val classIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt b/app/src/main/java/com/song2/jeonha/Main/data/HanokPrograms.kt similarity index 83% rename from app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt rename to app/src/main/java/com/song2/jeonha/Main/data/HanokPrograms.kt index d76da69..aecebf8 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/HanokPrograms.kt +++ b/app/src/main/java/com/song2/jeonha/Main/data/HanokPrograms.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Network.Get +package com.song2.jeonha.Main.data class HanokPrograms( diff --git a/app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt new file mode 100644 index 0000000..a0eb727 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt @@ -0,0 +1,9 @@ +package com.song2.jeonha.Main.data + +import com.song2.jeonha.Main.data.ClassPrograms +import com.song2.jeonha.Main.data.HanokPrograms + +class MainPrograms( + val hanokList: ArrayList, + val classList: ArrayList +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Main/ProgramData.kt b/app/src/main/java/com/song2/jeonha/Main/data/ProgramData.kt similarity index 74% rename from app/src/main/java/com/song2/jeonha/Main/ProgramData.kt rename to app/src/main/java/com/song2/jeonha/Main/data/ProgramData.kt index 1d4b986..74b6a80 100644 --- a/app/src/main/java/com/song2/jeonha/Main/ProgramData.kt +++ b/app/src/main/java/com/song2/jeonha/Main/data/ProgramData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.Main.data data class ProgramData( var id : Int, diff --git a/app/src/main/java/com/song2/jeonha/Main/TitleData.kt b/app/src/main/java/com/song2/jeonha/Main/data/TitleData.kt similarity index 73% rename from app/src/main/java/com/song2/jeonha/Main/TitleData.kt rename to app/src/main/java/com/song2/jeonha/Main/data/TitleData.kt index 08ea3c3..049bc47 100644 --- a/app/src/main/java/com/song2/jeonha/Main/TitleData.kt +++ b/app/src/main/java/com/song2/jeonha/Main/data/TitleData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.Main.data data class TitleData( var id : Int, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt new file mode 100644 index 0000000..ecea25d --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt @@ -0,0 +1,10 @@ +package com.song2.jeonha.Network.Get + +import com.song2.jeonha.Class.data.ClassDetailedData + +data class GetClassDetailResponse ( + val success: Boolean, + val status: Int, + val resMessage: String, + val data: ClassDetailedData +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt index 62de303..26171ea 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Map.data.MapData +import com.song2.jeonha.Main.data.MainPrograms class GetMainResponse( val success: Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt deleted file mode 100644 index a493150..0000000 --- a/app/src/main/java/com/song2/jeonha/Network/Get/MainPrograms.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.song2.jeonha.Network.Get - -class MainPrograms( - val hanokList: ArrayList, - val classList: ArrayList -) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 59e489a..2d549bd 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -3,11 +3,7 @@ package com.song2.jeonha.Network import com.google.gson.JsonObject import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse -import com.song2.jeonha.Network.Get.GetHanokDetailResponse -import com.song2.jeonha.Network.Get.GetHanokListResponse -import com.song2.jeonha.Network.Get.GetHanokMapResponse -import com.song2.jeonha.Network.Get.GetMainResponse -import com.song2.jeonha.Network.Get.GetStampResponse +import com.song2.jeonha.Network.Get.* import com.song2.jeonha.Network.Post.PostUserLogin import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse @@ -87,19 +83,17 @@ interface NetworkService { ): Call - //GET + //메인 조회 @GET("/main") fun getMainResponse( @Header("authorization") token: String ): Call -/* - - @GET("/class") - fun getaClassListResponse( - @Header("authorization") token: String, - @Query ("day") sort : Int - ): Call -*/ + + //클래스 디테일 + @GET("/class/{classIdx}") + fun getClassDetailResponse( + @Path("classIdx") classIdx: Int + ): Call } diff --git a/app/src/main/res/layout/activity_class_detail.xml b/app/src/main/res/layout/activity_class_detail.xml new file mode 100644 index 0000000..c52aab0 --- /dev/null +++ b/app/src/main/res/layout/activity_class_detail.xml @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_rv_class_date.xml b/app/src/main/res/layout/item_rv_class_date.xml new file mode 100644 index 0000000..ca8708b --- /dev/null +++ b/app/src/main/res/layout/item_rv_class_date.xml @@ -0,0 +1,35 @@ + + + + + + + + + + \ No newline at end of file From 7cbada09810dece74fd848200662bfc1b151b8c9 Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 16:26:59 +0900 Subject: [PATCH 08/17] Fordering UI package --- .../com/song2/jeonha/{ => UI}/Class/ClassDetailActivity.kt | 0 .../com/song2/jeonha/{ => UI}/Class/ClassListActivity.kt | 0 .../Class/adapter/ClassBookDateRecyclerViewAdapter.kt | 0 .../{ => UI}/Class/adapter/ClassListRecyclerViewAdapter.kt | 0 .../java/com/song2/jeonha/{ => UI}/Class/data/ClassData.kt | 0 .../song2/jeonha/{ => UI}/Class/data/ClassDetailedData.kt | 0 .../java/com/song2/jeonha/{ => UI}/Class/data/ImgData.kt | 0 .../com/song2/jeonha/{ => UI}/Class/data/ScheduleData.kt | 0 .../jeonha/{ => UI}/Hanok/HanOkRecyclcerViewAdapter.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/HanOkSliderFragment.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/HanokDetailActivity.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/HanokFilterActivity.kt | 0 .../song2/jeonha/{ => UI}/Hanok/adapter/HanokListAdapter.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/data/Authorization.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/data/HanokDetailItem.kt | 0 .../java/com/song2/jeonha/{ => UI}/Hanok/data/HanokItem.kt | 0 .../java/com/song2/jeonha/{ => UI}/Hanok/data/PhotoItem.kt | 0 .../main/java/com/song2/jeonha/{ => UI}/Hanok/data/Rooms.kt | 0 .../com/song2/jeonha/{ => UI}/Hanok/dialog/HanokDialog.kt | 0 .../java/com/song2/jeonha/{ => UI}/Login/LoginActivity.kt | 0 .../java/com/song2/jeonha/{ => UI}/Login/SignUpActivity.kt | 0 .../java/com/song2/jeonha/{ => UI}/Main/MainActivity.kt | 6 +----- .../jeonha/{ => UI}/Main/Mypage/ApplyHistoryActivity.kt | 0 .../MyPageFragment/ClassBookingRecyclerViewAdapter.kt | 0 .../{ => UI}/Main/Mypage/MyPageFragment/ClassFragment.kt | 0 .../Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt | 0 .../Mypage/MyPageFragment/GetMyBookingList/ClassData.kt | 0 .../GetMyBookingList/GetBookingClassListResponse.kt | 0 .../GetMyBookingList/GetBookingHanokListResponse.kt | 0 .../Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt | 0 .../Mypage/MyPageFragment/GetMyBookingList/HanokData.kt | 0 .../MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt | 0 .../{ => UI}/Main/Mypage/MyPageFragment/StayFragment.kt | 0 .../com/song2/jeonha/{ => UI}/Main/Mypage/MypageActivity.kt | 0 .../{ => UI}/Main/Mypage/TapAdapter/TapPagerAdapter.kt | 0 .../song2/jeonha/{ => UI}/Main/QRcode/QRcodeActivity.java | 0 .../{ => UI}/Main/adapter/ProgramListRecyclerViewAdapter.kt | 0 .../{ => UI}/Main/adapter/TitleListRecyclerViewAdapter.kt | 0 .../com/song2/jeonha/{ => UI}/Main/data/ClassPrograms.kt | 0 .../com/song2/jeonha/{ => UI}/Main/data/HanokPrograms.kt | 0 .../com/song2/jeonha/{ => UI}/Main/data/MainPrograms.kt | 0 .../java/com/song2/jeonha/{ => UI}/Main/data/ProgramData.kt | 0 .../java/com/song2/jeonha/{ => UI}/Main/data/TitleData.kt | 0 .../main/java/com/song2/jeonha/{ => UI}/Map/MapActivity.kt | 0 .../main/java/com/song2/jeonha/{ => UI}/Map/data/MapData.kt | 0 .../java/com/song2/jeonha/{ => UI}/Splash/SplashActivity.kt | 0 46 files changed, 1 insertion(+), 5 deletions(-) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/ClassDetailActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/ClassListActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/adapter/ClassBookDateRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/adapter/ClassListRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/data/ClassData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/data/ClassDetailedData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/data/ImgData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Class/data/ScheduleData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/HanOkRecyclcerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/HanOkSliderFragment.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/HanokDetailActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/HanokFilterActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/adapter/HanokListAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/data/Authorization.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/data/HanokDetailItem.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/data/HanokItem.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/data/PhotoItem.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/data/Rooms.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Hanok/dialog/HanokDialog.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Login/LoginActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Login/SignUpActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/MainActivity.kt (98%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/ApplyHistoryActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/ClassFragment.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/StayFragment.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MypageActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/TapAdapter/TapPagerAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/QRcode/QRcodeActivity.java (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/adapter/ProgramListRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/adapter/TitleListRecyclerViewAdapter.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/data/ClassPrograms.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/data/HanokPrograms.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/data/MainPrograms.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/data/ProgramData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/data/TitleData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Map/MapActivity.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Map/data/MapData.kt (100%) rename app/src/main/java/com/song2/jeonha/{ => UI}/Splash/SplashActivity.kt (100%) diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/ClassDetailActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/adapter/ClassBookDateRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/adapter/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/adapter/ClassListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/data/ClassData.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ClassDetailedData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/data/ClassDetailedData.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/data/ImgData.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt diff --git a/app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Class/data/ScheduleData.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanOkRecyclcerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/HanOkRecyclcerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanOkSliderFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/HanOkSliderFragment.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanokFilterActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/HanokFilterActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/adapter/HanokListAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/adapter/HanokListAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/Authorization.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/data/Authorization.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/data/HanokDetailItem.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/HanokItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/data/HanokItem.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/data/PhotoItem.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/data/Rooms.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/data/Rooms.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt diff --git a/app/src/main/java/com/song2/jeonha/Hanok/dialog/HanokDialog.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Hanok/dialog/HanokDialog.kt rename to app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt diff --git a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt similarity index 98% rename from app/src/main/java/com/song2/jeonha/Main/MainActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt index 5f3f1c5..087d952 100644 --- a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -39,9 +39,6 @@ class MainActivity : AppCompatActivity() { lateinit var titleListRecyclerViewAdapter: TitleListRecyclerViewAdapter var titleListData: ArrayList = ArrayList() - //lateinit var mainProgram: MainPrograms ; - - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_main) @@ -181,8 +178,7 @@ class MainActivity : AppCompatActivity() { } else { Log.e("mainPrograms success", ":::test") } - }else - Log.e("mainPrograms test", ":::test") + } }else Log.e("mainPrograms fail", ":::test") diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/ApplyHistoryActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/ApplyHistoryActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/ClassFragment.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/StayFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/StayFragment.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MypageActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MypageActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/TapAdapter/TapPagerAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/TapAdapter/TapPagerAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/QRcode/QRcodeActivity.java b/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/QRcode/QRcodeActivity.java rename to app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java diff --git a/app/src/main/java/com/song2/jeonha/Main/adapter/ProgramListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/adapter/ProgramListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/adapter/TitleListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/adapter/TitleListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/data/ClassPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/data/ClassPrograms.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/data/HanokPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/data/HanokPrograms.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/data/MainPrograms.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/data/ProgramData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/data/ProgramData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt diff --git a/app/src/main/java/com/song2/jeonha/Main/data/TitleData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Main/data/TitleData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt diff --git a/app/src/main/java/com/song2/jeonha/Map/MapActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Map/MapActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt diff --git a/app/src/main/java/com/song2/jeonha/Map/data/MapData.kt b/app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Map/data/MapData.kt rename to app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt diff --git a/app/src/main/java/com/song2/jeonha/Splash/SplashActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt similarity index 100% rename from app/src/main/java/com/song2/jeonha/Splash/SplashActivity.kt rename to app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt From 6b2d288e56f27a5c79fab5eeaef32d2349eaa307 Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 16:27:15 +0900 Subject: [PATCH 09/17] Fordering UI package --- .../Network/Get/GetClassDetailResponse.kt | 2 +- .../Network/Get/GetHanokDetailResponse.kt | 2 +- .../jeonha/Network/Get/GetHanokListResponse.kt | 2 +- .../jeonha/Network/Get/GetHanokMapResponse.kt | 2 +- .../jeonha/Network/Get/GetMainResponse.kt | 2 +- .../jeonha/Network/Get/GetStampResponse.kt | 2 -- .../com/song2/jeonha/Network/NetworkService.kt | 7 ++----- .../Post/Response/PostUserLoginResponse.kt | 2 +- .../Post/Response/PostUserSignUpResponse.kt | 2 +- .../song2/jeonha/NetworkDataClass/StampData.kt | 2 -- .../jeonha/UI/Class/ClassDetailActivity.kt | 6 +++--- .../song2/jeonha/UI/Class/ClassListActivity.kt | 6 +++--- .../ClassBookDateRecyclerViewAdapter.kt | 12 ++---------- .../adapter/ClassListRecyclerViewAdapter.kt | 6 +++--- .../song2/jeonha/UI/Class/data/ClassData.kt | 2 +- .../jeonha/UI/Class/data/ClassDetailedData.kt | 4 +--- .../com/song2/jeonha/UI/Class/data/ImgData.kt | 2 +- .../song2/jeonha/UI/Class/data/ScheduleData.kt | 2 +- .../UI/Hanok/HanOkRecyclcerViewAdapter.kt | 4 ++-- .../jeonha/UI/Hanok/HanOkSliderFragment.kt | 2 +- .../jeonha/UI/Hanok/HanokDetailActivity.kt | 6 +++--- .../jeonha/UI/Hanok/HanokFilterActivity.kt | 7 +++---- .../UI/Hanok/adapter/HanokListAdapter.kt | 6 +++--- .../jeonha/UI/Hanok/data/Authorization.kt | 2 +- .../jeonha/UI/Hanok/data/HanokDetailItem.kt | 2 +- .../song2/jeonha/UI/Hanok/data/HanokItem.kt | 2 +- .../song2/jeonha/UI/Hanok/data/PhotoItem.kt | 2 +- .../com/song2/jeonha/UI/Hanok/data/Rooms.kt | 2 +- .../jeonha/UI/Hanok/dialog/HanokDialog.kt | 2 +- .../com/song2/jeonha/UI/Login/LoginActivity.kt | 5 ++--- .../song2/jeonha/UI/Login/SignUpActivity.kt | 6 ++---- .../com/song2/jeonha/UI/Main/MainActivity.kt | 18 +++++++++--------- .../UI/Main/Mypage/ApplyHistoryActivity.kt | 4 ++-- .../ClassBookingRecyclerViewAdapter.kt | 4 ++-- .../Mypage/MyPageFragment/ClassFragment.kt | 6 +++--- .../MyPageFragment/GetMyBookingList/CData.kt | 2 +- .../GetMyBookingList/ClassData.kt | 2 +- .../GetBookingClassListResponse.kt | 2 +- .../GetBookingHanokListResponse.kt | 2 +- .../MyPageFragment/GetMyBookingList/HData.kt | 2 +- .../GetMyBookingList/HanokData.kt | 2 +- .../HanokStayBookingRecyclerViewAdapter.kt | 5 ++--- .../Main/Mypage/MyPageFragment/StayFragment.kt | 10 +++------- .../jeonha/UI/Main/Mypage/MypageActivity.kt | 14 +------------- .../Main/Mypage/TapAdapter/TapPagerAdapter.kt | 7 +++---- .../jeonha/UI/Main/QRcode/QRcodeActivity.java | 8 +------- .../adapter/ProgramListRecyclerViewAdapter.kt | 4 ++-- .../adapter/TitleListRecyclerViewAdapter.kt | 4 ++-- .../song2/jeonha/UI/Main/data/ClassPrograms.kt | 2 +- .../song2/jeonha/UI/Main/data/HanokPrograms.kt | 2 +- .../song2/jeonha/UI/Main/data/MainPrograms.kt | 5 +---- .../song2/jeonha/UI/Main/data/ProgramData.kt | 2 +- .../com/song2/jeonha/UI/Main/data/TitleData.kt | 2 +- .../com/song2/jeonha/UI/Map/MapActivity.kt | 8 ++++---- .../com/song2/jeonha/UI/Map/data/MapData.kt | 2 +- .../song2/jeonha/UI/Splash/SplashActivity.kt | 4 ++-- .../main/res/layout/activity_apply_history.xml | 2 +- .../main/res/layout/activity_class_detail.xml | 2 +- .../main/res/layout/activity_class_list.xml | 2 +- .../main/res/layout/activity_hanok_detail.xml | 4 ++-- app/src/main/res/layout/activity_login.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/activity_map.xml | 2 +- app/src/main/res/layout/activity_mypage.xml | 2 +- app/src/main/res/layout/activity_qrcode.xml | 2 +- app/src/main/res/layout/activity_sign_up.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 2 +- app/src/main/res/layout/fragment_class.xml | 2 +- .../main/res/layout/fragment_han_ok_slider.xml | 2 +- app/src/main/res/layout/fragment_stay.xml | 2 +- 70 files changed, 109 insertions(+), 157 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt index ecea25d..786ae26 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassDetailResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Class.data.ClassDetailedData +import com.song2.jeonha.UI.Class.data.ClassDetailedData data class GetClassDetailResponse ( val success: Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt index d831d07..ab5a2b4 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokDetailResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Hanok.data.HanokDetailItem +import com.song2.jeonha.UI.Hanok.data.HanokDetailItem class GetHanokDetailResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokListResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokListResponse.kt index cfda04d..352211d 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokListResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokListResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Hanok.data.HanokItem +import com.song2.jeonha.UI.Hanok.data.HanokItem class GetHanokListResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokMapResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokMapResponse.kt index 142f165..e4b260f 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokMapResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetHanokMapResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Map.data.MapData +import com.song2.jeonha.UI.Map.data.MapData class GetHanokMapResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt index 26171ea..b04a8e6 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetMainResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Main.data.MainPrograms +import com.song2.jeonha.UI.Main.data.MainPrograms class GetMainResponse( val success: Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetStampResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetStampResponse.kt index ef43ec4..9801943 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetStampResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetStampResponse.kt @@ -1,8 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Map.data.MapData import com.song2.jeonha.NetworkDataClass.StampAndNameData -import com.song2.jeonha.NetworkDataClass.StampData class GetStampResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 2d549bd..fe94d11 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -1,15 +1,12 @@ package com.song2.jeonha.Network -import com.google.gson.JsonObject -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse import com.song2.jeonha.Network.Get.* import com.song2.jeonha.Network.Post.PostUserLogin import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse import com.song2.jeonha.Network.Post.Response.PostUserSignUpResponse -import okhttp3.MultipartBody -import okhttp3.RequestBody import retrofit2.Call import retrofit2.http.* diff --git a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserLoginResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserLoginResponse.kt index 4fc5c4d..e2bc9f7 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserLoginResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserLoginResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Post.Response -import com.song2.jeonha.Hanok.data.Authorization +import com.song2.jeonha.UI.Hanok.data.Authorization class PostUserLoginResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt index 0ddeb34..711d871 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Post.Response -import com.song2.jeonha.Hanok.data.Authorization +import com.song2.jeonha.UI.Hanok.data.Authorization data class PostUserSignUpResponse( val success : Boolean, diff --git a/app/src/main/java/com/song2/jeonha/NetworkDataClass/StampData.kt b/app/src/main/java/com/song2/jeonha/NetworkDataClass/StampData.kt index 80465da..a5ed262 100644 --- a/app/src/main/java/com/song2/jeonha/NetworkDataClass/StampData.kt +++ b/app/src/main/java/com/song2/jeonha/NetworkDataClass/StampData.kt @@ -1,7 +1,5 @@ package com.song2.jeonha.NetworkDataClass -import com.song2.jeonha.Map.data.MapData - class StampData( val writetime : String?, val idx : Int?, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt index 4e481d1..f52b523 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt @@ -1,11 +1,11 @@ -package com.song2.jeonha.Class +package com.song2.jeonha.UI.Class import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.util.Log -import com.song2.jeonha.Class.adapter.ClassBookDateRecyclerViewAdapter -import com.song2.jeonha.Class.data.ClassDetailedData +import com.song2.jeonha.UI.Class.adapter.ClassBookDateRecyclerViewAdapter +import com.song2.jeonha.UI.Class.data.ClassDetailedData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetClassDetailResponse import com.song2.jeonha.Network.NetworkService diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt index 4095bc0..02380fb 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class +package com.song2.jeonha.UI.Class import android.app.Dialog import android.support.v7.app.AppCompatActivity @@ -8,8 +8,8 @@ import android.view.Window import android.widget.RadioButton import android.widget.RelativeLayout import android.widget.TextView -import com.song2.jeonha.Class.adapter.ClassListRecyclerViewAdapter -import com.song2.jeonha.Class.data.ClassData +import com.song2.jeonha.UI.Class.adapter.ClassListRecyclerViewAdapter +import com.song2.jeonha.UI.Class.data.ClassData import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_class_list.* diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt index c160f1f..f24ac3a 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt @@ -1,21 +1,13 @@ -package com.song2.jeonha.Class.adapter +package com.song2.jeonha.UI.Class.adapter import android.content.Context -import android.graphics.Color -import android.graphics.PorterDuff import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView -import android.widget.RelativeLayout import android.widget.TextView -import com.bumptech.glide.Glide -import com.song2.jeonha.Class.ClassDetailActivity -import com.song2.jeonha.Class.data.ClassData -import com.song2.jeonha.Class.data.ScheduleData +import com.song2.jeonha.UI.Class.data.ScheduleData import com.song2.jeonha.R -import org.jetbrains.anko.startActivity class ClassBookDateRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt index 7eb787b..28135b7 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class.adapter +package com.song2.jeonha.UI.Class.adapter import android.content.Context import android.graphics.Color @@ -11,8 +11,8 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Class.ClassDetailActivity -import com.song2.jeonha.Class.data.ClassData +import com.song2.jeonha.UI.Class.ClassDetailActivity +import com.song2.jeonha.UI.Class.data.ClassData import com.song2.jeonha.R import org.jetbrains.anko.startActivity diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt index 5f8f572..32417bb 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class.data +package com.song2.jeonha.UI.Class.data data class ClassData( var id : Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt index 1dfeed7..873a6b7 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt @@ -1,6 +1,4 @@ -package com.song2.jeonha.Class.data - -import com.song2.jeonha.Hanok.data.PhotoItem +package com.song2.jeonha.UI.Class.data data class ClassDetailedData( val classIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt index 0c496a8..9d0e0bf 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class.data +package com.song2.jeonha.UI.Class.data class ImgData( val ciIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt index 148db2a..2851804 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class.data +package com.song2.jeonha.UI.Class.data class ScheduleData( val weekIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt index b6efa78..0ac8afa 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok +package com.song2.jeonha.UI.Hanok import android.content.Context import android.support.v7.widget.RecyclerView @@ -6,7 +6,7 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.TextView -import com.song2.jeonha.Hanok.data.Rooms +import com.song2.jeonha.UI.Hanok.data.Rooms import com.song2.jeonha.R class HanOkRecyclcerViewAdapter(val ctx: Context, val roomsList: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt index 323e84c..d0f99aa 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok +package com.song2.jeonha.UI.Hanok import android.os.Bundle diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt index 7e9ef2e..7d35a54 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok +package com.song2.jeonha.UI.Hanok import android.support.v7.app.AppCompatActivity import android.os.Bundle @@ -11,8 +11,8 @@ import com.google.android.gms.maps.SupportMapFragment import com.google.android.gms.maps.model.BitmapDescriptorFactory import com.google.android.gms.maps.model.LatLng import com.google.android.gms.maps.model.MarkerOptions -import com.song2.jeonha.Hanok.data.HanokDetailItem -import com.song2.jeonha.Hanok.data.Rooms +import com.song2.jeonha.UI.Hanok.data.HanokDetailItem +import com.song2.jeonha.UI.Hanok.data.Rooms import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetHanokDetailResponse import com.song2.jeonha.Network.NetworkService diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt index 56f89cb..de7e432 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok +package com.song2.jeonha.UI.Hanok import android.app.Dialog import android.support.v7.app.AppCompatActivity @@ -7,15 +7,14 @@ import android.support.v7.widget.LinearLayoutManager import android.util.Log import android.widget.LinearLayout import android.widget.RadioButton -import com.song2.jeonha.Hanok.adapter.HanokListAdapter -import com.song2.jeonha.Hanok.data.HanokItem +import com.song2.jeonha.UI.Hanok.adapter.HanokListAdapter +import com.song2.jeonha.UI.Hanok.data.HanokItem import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetHanokListResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_hanok_filter.* import kotlinx.android.synthetic.main.dialog_hanok.* -import org.jetbrains.anko.toast import retrofit2.Call import retrofit2.Callback import retrofit2.Response diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt index 22917ed..2f88c32 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.adapter +package com.song2.jeonha.UI.Hanok.adapter import android.content.Context import android.content.Intent @@ -12,8 +12,8 @@ import android.widget.ImageView import android.widget.LinearLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Hanok.HanokDetailActivity -import com.song2.jeonha.Hanok.data.HanokItem +import com.song2.jeonha.UI.Hanok.HanokDetailActivity +import com.song2.jeonha.UI.Hanok.data.HanokItem import com.song2.jeonha.R class HanokListAdapter(var ctx: Context, var dataList: ArrayList) : diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt index e5f110f..1b9e7e3 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.data +package com.song2.jeonha.UI.Hanok.data data class Authorization( diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt index be4552a..7ea32c0 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.data +package com.song2.jeonha.UI.Hanok.data data class HanokDetailItem( val hanokIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt index 01a0f03..56c223e 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokItem.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.data +package com.song2.jeonha.UI.Hanok.data data class HanokItem( val hanokIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt index b7c1701..f493f66 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.data +package com.song2.jeonha.UI.Hanok.data data class PhotoItem( val img : String diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt index 2f42cf5..24fe8de 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Rooms.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.data +package com.song2.jeonha.UI.Hanok.data data class Rooms( diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt index 1219e4a..5e20fc7 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Hanok.dialog +package com.song2.jeonha.UI.Hanok.dialog import android.os.Bundle import android.support.v4.app.DialogFragment diff --git a/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt index a2597dd..88e3f17 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Login +package com.song2.jeonha.UI.Login import android.graphics.Color import android.support.v7.app.AppCompatActivity @@ -6,8 +6,7 @@ import android.os.Bundle import android.text.Editable import android.text.TextWatcher import android.util.Log -import android.widget.Toast -import com.song2.jeonha.Main.MainActivity +import com.song2.jeonha.UI.Main.MainActivity import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.Network.Post.PostUserLogin diff --git a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt index 9403875..e47179d 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt @@ -1,16 +1,14 @@ -package com.song2.jeonha.Login +package com.song2.jeonha.UI.Login -import android.graphics.Color import android.os.Bundle import android.support.v7.app.AppCompatActivity import android.util.Log -import com.song2.jeonha.Main.MainActivity +import com.song2.jeonha.UI.Main.MainActivity import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserSignUpResponse import com.song2.jeonha.R -import kotlinx.android.synthetic.main.activity_login.* import kotlinx.android.synthetic.main.activity_sign_up.* import org.jetbrains.anko.startActivity import org.jetbrains.anko.toast diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt index 087d952..eb46ff0 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.UI.Main import android.app.Activity import android.content.Intent @@ -8,16 +8,16 @@ import android.support.v7.widget.LinearLayoutManager import android.util.Log import android.widget.Toast import com.google.zxing.integration.android.IntentIntegrator -import com.song2.jeonha.Class.ClassListActivity -import com.song2.jeonha.Main.Mypage.MypageActivity -import com.song2.jeonha.Main.QRcode.QRcodeActivity -import com.song2.jeonha.Main.adapter.ProgramListRecyclerViewAdapter -import com.song2.jeonha.Main.adapter.TitleListRecyclerViewAdapter -import com.song2.jeonha.Main.data.ProgramData -import com.song2.jeonha.Main.data.TitleData +import com.song2.jeonha.UI.Class.ClassListActivity +import com.song2.jeonha.UI.Main.Mypage.MypageActivity +import com.song2.jeonha.UI.Main.QRcode.QRcodeActivity +import com.song2.jeonha.UI.Main.adapter.ProgramListRecyclerViewAdapter +import com.song2.jeonha.UI.Main.adapter.TitleListRecyclerViewAdapter +import com.song2.jeonha.UI.Main.data.ProgramData +import com.song2.jeonha.UI.Main.data.TitleData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetMainResponse -import com.song2.jeonha.Main.data.MainPrograms +import com.song2.jeonha.UI.Main.data.MainPrograms import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_main.* diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt index f799b67..8d03ea7 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/ApplyHistoryActivity.kt @@ -1,11 +1,11 @@ -package com.song2.jeonha.Main.Mypage +package com.song2.jeonha.UI.Main.Mypage import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.widget.RelativeLayout -import com.song2.jeonha.Main.Mypage.TapAdapter.TapPagerAdapter +import com.song2.jeonha.UI.Main.Mypage.TapAdapter.TapPagerAdapter import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_apply_history.* diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt index 573cc71..77c03b3 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment import android.content.Context import android.support.v7.widget.RecyclerView @@ -9,7 +9,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData import com.song2.jeonha.R class ClassBookingRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt index d159837..946817b 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassFragment.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment import android.os.Bundle @@ -8,8 +8,8 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.NetworkService diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt index 47a0bb4..6058dde 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class CData( val list: ArrayList, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt index 4212b24..287a537 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class ClassData( val classIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt index 16fa2b7..2477d2a 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class GetBookingClassListResponse( val data: CData, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt index 73f2331..7405578 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class GetBookingHanokListResponse( val data: HData, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt index 2ef4bfb..f0878c2 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class HData( val list: ArrayList, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt index 1eda028..ae522ed 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class HanokData( val address: String, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt index daf6d52..7546a7b 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment import android.content.Context import android.support.v7.widget.RecyclerView @@ -9,8 +9,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.HanokData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.HanokData import com.song2.jeonha.R class HanokStayBookingRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt index e80982a..b191f31 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment import android.os.Bundle @@ -8,16 +8,12 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.ImageView -import com.bumptech.glide.Glide -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.HanokData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.HanokData import com.song2.jeonha.Network.ApplicationController -import com.song2.jeonha.Network.Get.GetStampResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R -import kotlinx.android.synthetic.main.fragment_class.* import kotlinx.android.synthetic.main.fragment_stay.* import org.jetbrains.anko.support.v4.ctx import retrofit2.Call diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt index f4032c3..c3bfb51 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt @@ -1,11 +1,9 @@ -package com.song2.jeonha.Main.Mypage +package com.song2.jeonha.UI.Main.Mypage import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.util.Log -import com.song2.jeonha.Hanok.data.HanokItem import com.song2.jeonha.Network.ApplicationController -import com.song2.jeonha.Network.Get.GetHanokListResponse import com.song2.jeonha.Network.Get.GetStampResponse import com.song2.jeonha.Network.NetworkService import kotlinx.android.synthetic.main.activity_mypage.* @@ -13,19 +11,9 @@ import org.jetbrains.anko.startActivity import retrofit2.Call import retrofit2.Callback import retrofit2.Response -import android.graphics.BitmapFactory -import android.graphics.Bitmap -import android.support.v4.app.SupportActivity -import android.support.v4.app.SupportActivity.ExtraData -import android.support.v4.content.ContextCompat.getSystemService -import android.icu.lang.UCharacter.GraphemeClusterBreak.T -import android.support.v4.content.ContextCompat.getSystemService -import android.icu.lang.UCharacter.GraphemeClusterBreak.T -import android.widget.Button import android.widget.ImageView import com.bumptech.glide.Glide import com.song2.jeonha.R -import org.jetbrains.anko.toast class MypageActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt index 5d67a58..2bde9c1 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt @@ -1,11 +1,10 @@ -package com.song2.jeonha.Main.Mypage.TapAdapter +package com.song2.jeonha.UI.Main.Mypage.TapAdapter import android.support.v4.app.Fragment import android.support.v4.app.FragmentManager import android.support.v4.app.FragmentStatePagerAdapter -import com.song2.jeonha.Main.Mypage.MyPageFragment.ClassFragment -import com.song2.jeonha.Main.Mypage.MyPageFragment.StayFragment -import org.jetbrains.anko.db.classParser +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.ClassFragment +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.StayFragment class TapPagerAdapter(fm : FragmentManager, private val num_frament: Int):FragmentStatePagerAdapter(fm){ /* diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java b/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java index 95bbd04..16afd9f 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java +++ b/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java @@ -1,17 +1,11 @@ -package com.song2.jeonha.Main.QRcode; +package com.song2.jeonha.UI.Main.QRcode; -import android.app.Activity; -import android.content.Intent; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; -import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; -import android.widget.Toast; -import com.google.zxing.integration.android.IntentIntegrator; -import com.google.zxing.integration.android.IntentResult; import com.journeyapps.barcodescanner.CaptureManager; import com.journeyapps.barcodescanner.DecoratedBarcodeView; import com.song2.jeonha.R; diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt index a3edb8c..c5ea79c 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.adapter +package com.song2.jeonha.UI.Main.adapter import android.content.Context import android.support.v7.widget.RecyclerView @@ -8,7 +8,7 @@ import android.view.ViewGroup import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Main.data.ProgramData +import com.song2.jeonha.UI.Main.data.ProgramData import com.song2.jeonha.R import de.hdodenhof.circleimageview.CircleImageView diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt index 0dfcdbd..de4c6a9 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.adapter +package com.song2.jeonha.UI.Main.adapter import android.content.Context import android.graphics.Color @@ -13,7 +13,7 @@ import android.widget.TextView import com.bumptech.glide.Glide import com.bumptech.glide.load.resource.bitmap.RoundedCorners import com.bumptech.glide.request.RequestOptions -import com.song2.jeonha.Main.data.TitleData +import com.song2.jeonha.UI.Main.data.TitleData import com.song2.jeonha.R diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt index 2abfb91..b1bd0c5 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.data +package com.song2.jeonha.UI.Main.data class ClassPrograms( val classIdx: Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt index aecebf8..19d22a1 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.data +package com.song2.jeonha.UI.Main.data class HanokPrograms( diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt index a0eb727..e4327c4 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt @@ -1,7 +1,4 @@ -package com.song2.jeonha.Main.data - -import com.song2.jeonha.Main.data.ClassPrograms -import com.song2.jeonha.Main.data.HanokPrograms +package com.song2.jeonha.UI.Main.data class MainPrograms( val hanokList: ArrayList, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt index 74b6a80..07f53e0 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.data +package com.song2.jeonha.UI.Main.data data class ProgramData( var id : Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt index 049bc47..3214d14 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.data +package com.song2.jeonha.UI.Main.data data class TitleData( var id : Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt index 88152a5..259ffdd 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Map/MapActivity.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Map +package com.song2.jeonha.UI.Map import android.Manifest import android.annotation.SuppressLint @@ -17,9 +17,9 @@ import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.OnMapReadyCallback import com.google.android.gms.maps.SupportMapFragment import com.google.android.gms.maps.model.* -import com.song2.jeonha.Class.ClassListActivity -import com.song2.jeonha.Hanok.HanokDetailActivity -import com.song2.jeonha.Map.data.MapData +import com.song2.jeonha.UI.Class.ClassListActivity +import com.song2.jeonha.UI.Hanok.HanokDetailActivity +import com.song2.jeonha.UI.Map.data.MapData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetHanokMapResponse import com.song2.jeonha.Network.NetworkService diff --git a/app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt b/app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt index f34a45a..bc339e9 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Map/data/MapData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Map.data +package com.song2.jeonha.UI.Map.data data class MapData( val hanokIdx : Int, diff --git a/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt index a8f89f1..5036494 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt @@ -1,9 +1,9 @@ -package com.song2.jeonha.Splash +package com.song2.jeonha.UI.Splash import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.os.Handler -import com.song2.jeonha.Login.LoginActivity +import com.song2.jeonha.UI.Login.LoginActivity import com.song2.jeonha.R import org.jetbrains.anko.startActivity diff --git a/app/src/main/res/layout/activity_apply_history.xml b/app/src/main/res/layout/activity_apply_history.xml index b740ce5..b300255 100644 --- a/app/src/main/res/layout/activity_apply_history.xml +++ b/app/src/main/res/layout/activity_apply_history.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Main.Mypage.ApplyHistoryActivity"> + tools:context=".UI.Main.Mypage.ApplyHistoryActivity"> + tools:context=".UI.Hanok.HanokDetailActivity"> + tools:context=".UI.Class.ClassListActivity"> + tools:context=".UI.Hanok.HanokDetailActivity"> + tools:context=".UI.Hanok.HanokDetailActivity" /> + tools:context=".UI.Login.LoginActivity"> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index be5c83d..5d92b1c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -37,7 +37,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".Main.MainActivity"> + tools:context=".UI.Main.MainActivity"> diff --git a/app/src/main/res/layout/activity_map.xml b/app/src/main/res/layout/activity_map.xml index 52a53ba..edb71bd 100644 --- a/app/src/main/res/layout/activity_map.xml +++ b/app/src/main/res/layout/activity_map.xml @@ -18,7 +18,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_below="@+id/toolbar_map" - tools:context=".Map.MapActivity" /> + tools:context=".UI.Map.MapActivity" /> + tools:context=".UI.Main.Mypage.MypageActivity"> + tools:context=".UI.Main.QRcode.QRcodeActivity"> + tools:context=".UI.Login.SignUpActivity"> + tools:context=".UI.Splash.SplashActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_class.xml b/app/src/main/res/layout/fragment_class.xml index 3228dda..d59d603 100644 --- a/app/src/main/res/layout/fragment_class.xml +++ b/app/src/main/res/layout/fragment_class.xml @@ -5,7 +5,7 @@ android:orientation="vertical" android:layout_height="match_parent" android:background="#ffffff" - tools:context=".Main.Mypage.MyPageFragment.ClassFragment"> + tools:context=".UI.Main.Mypage.MyPageFragment.ClassFragment"> + tools:context=".UI.Hanok.HanOkSliderFragment"> + tools:context=".UI.Main.Mypage.MyPageFragment.StayFragment"> Date: Sun, 29 Sep 2019 17:47:24 +0900 Subject: [PATCH 10/17] Add dialog to class_list --- .../jeonha/UI/Class/ClassListActivity.kt | 43 +++- .../com/song2/jeonha/UI/Main/MainActivity.kt | 9 +- .../main/res/layout/dialog_select_class.xml | 199 ++++-------------- 3 files changed, 85 insertions(+), 166 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt index 1c9a058..6f0c59b 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt @@ -16,6 +16,7 @@ import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import com.song2.jeonha.UI.Class.adapter.ClassListRecyclerViewAdapter import kotlinx.android.synthetic.main.activity_class_list.* +import kotlinx.android.synthetic.main.dialog_select_class.* import retrofit2.Call import retrofit2.Response @@ -49,16 +50,46 @@ class ClassListActivity : AppCompatActivity() { val dialogQuit = dlg.findViewById(R.id.tv_select_class_dialog_quit_btn) val dialogSubmit = dlg.findViewById(R.id.tv_select_class_dialog_submit_btn) - val monContainer = dlg.findViewById(R.id.rl_select_class_dialog_monday) - val monRadio = dlg.findViewById(R.id.rb_select_class_dialog_monday) - monContainer.setOnClickListener { - if (monRadio.isChecked){ - - } + val one = dlg.findViewById(R.id.rb_select_class_dialog_monday) + val two = dlg.findViewById(R.id.rb_select_class_dialog_tuesday) + val three = dlg.findViewById(R.id.rb_select_class_dialog_wednesday) + val four = dlg.findViewById(R.id.rb_select_class_dialog_thursday) + val five = dlg.findViewById(R.id.rb_select_class_dialog_friday) + val six = dlg.findViewById(R.id.rb_select_class_dialog_saturday) + val seven = dlg.findViewById(R.id.rb_select_class_dialog_sunday) + + one.setOnClickListener { + getClassListResponse(1) + } + + two.setOnClickListener { + getClassListResponse(2) + } + + three.setOnClickListener { + getClassListResponse(3) + + } + + four.setOnClickListener { + getClassListResponse(4) + } + + five.setOnClickListener { + getClassListResponse(5) + } + + + six.setOnClickListener { + getClassListResponse(6) } + seven.setOnClickListener { + getClassListResponse(7) + } + dialogQuit.setOnClickListener { dlg.dismiss() } diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt index 630c84d..bf25371 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -20,6 +20,7 @@ import com.song2.jeonha.UI.Main.data.MainPrograms import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import com.song2.jeonha.UI.Class.ClassListActivity +import com.song2.jeonha.UI.Hanok.HanokFilterActivity import kotlinx.android.synthetic.main.activity_main.* import org.jetbrains.anko.startActivity @@ -51,10 +52,6 @@ class MainActivity : AppCompatActivity() { onQrcodeScanner() } - iv_main_act_more_btn.setOnClickListener { - startActivity() - } - getMainProgramsResponse() setClassProgramRecyclerView(arrayListData) setTitleRecyclerView() @@ -65,15 +62,13 @@ class MainActivity : AppCompatActivity() { Log.e("한옥통신", "In " + switch_main_main_act_selector.isSelected()) setClassProgramRecyclerView(arrayListData) iv_main_act_more_btn.setOnClickListener { - startActivity() + startActivity() } } else { //클래스통신 Log.e("클래스통신", "In " + switch_main_main_act_selector.isSelected()) - setClassProgramRecyclerView(arrayListClassData) - iv_main_act_more_btn.setOnClickListener { startActivity() } diff --git a/app/src/main/res/layout/dialog_select_class.xml b/app/src/main/res/layout/dialog_select_class.xml index e775354..75d936d 100644 --- a/app/src/main/res/layout/dialog_select_class.xml +++ b/app/src/main/res/layout/dialog_select_class.xml @@ -4,175 +4,68 @@ android:layout_height="344dp" android:orientation="vertical"> + android:layout_width="match_parent" + android:layout_height="68dp" android:paddingStart="16dp"> + android:layout_width="match_parent" + android:layout_height="224dp" android:orientation="vertical" + android:paddingStart="16dp"> + + - - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:text="월요일"/> + - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> - - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> + - - + android:layout_width="match_parent" + android:layout_height="40dp" android:layout_centerVertical="true"/> + + @@ -182,29 +75,29 @@ From bd35dd75c98c69fe15deec28e81aac08499ce28a Mon Sep 17 00:00:00 2001 From: seunghee63 <0603yang@naver.com> Date: Sun, 29 Sep 2019 17:54:54 +0900 Subject: [PATCH 11/17] Add connecting main to Detailed --- .../java/com/song2/jeonha/UI/Main/MainActivity.kt | 6 +++++- .../Main/adapter/ProgramListRecyclerViewAdapter.kt | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt index bf25371..a561296 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -33,6 +33,7 @@ class MainActivity : AppCompatActivity() { ApplicationController.instance.networkService } + var b : Boolean = false lateinit var programListRecyclerViewAdapter: ProgramListRecyclerViewAdapter var arrayListData: ArrayList = ArrayList() var arrayListClassData: ArrayList = ArrayList() @@ -60,7 +61,9 @@ class MainActivity : AppCompatActivity() { if (!checked) { //한옥통신 Log.e("한옥통신", "In " + switch_main_main_act_selector.isSelected()) + b = false setClassProgramRecyclerView(arrayListData) + iv_main_act_more_btn.setOnClickListener { startActivity() } @@ -68,6 +71,7 @@ class MainActivity : AppCompatActivity() { } else { //클래스통신 Log.e("클래스통신", "In " + switch_main_main_act_selector.isSelected()) + b = true setClassProgramRecyclerView(arrayListClassData) iv_main_act_more_btn.setOnClickListener { startActivity() @@ -81,7 +85,7 @@ class MainActivity : AppCompatActivity() { Log.e("리사이클러뷰 Data", ":::confirm"+arrayListData.size) - programListRecyclerViewAdapter = ProgramListRecyclerViewAdapter(this, arrayListData) + programListRecyclerViewAdapter = ProgramListRecyclerViewAdapter(this, arrayListData,b) programListRecyclerViewAdapter.notifyDataSetChanged() rv_main_act_class_list.adapter = programListRecyclerViewAdapter rv_main_act_class_list.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false) diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt index c5ea79c..9f88c73 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt @@ -1,6 +1,7 @@ package com.song2.jeonha.UI.Main.adapter import android.content.Context +import android.support.v4.content.ContextCompat.startActivity import android.support.v7.widget.RecyclerView import android.view.LayoutInflater import android.view.View @@ -10,10 +11,13 @@ import android.widget.TextView import com.bumptech.glide.Glide import com.song2.jeonha.UI.Main.data.ProgramData import com.song2.jeonha.R +import com.song2.jeonha.UI.Class.ClassDetailActivity +import com.song2.jeonha.UI.Hanok.HanokDetailActivity import de.hdodenhof.circleimageview.CircleImageView +import org.jetbrains.anko.startActivity -class ProgramListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { +class ProgramListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList, var b : Boolean) : RecyclerView.Adapter() { override fun onCreateViewHolder(viewgroup: ViewGroup, position: Int): Holder { @@ -30,7 +34,13 @@ class ProgramListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList

("idx" to dataList[position].id) + } + else{ + ctx.startActivity("idx" to dataList[position].id) + + } } Glide.with(ctx) From 957c4552182a06eea6f40dc8418505db45d67431 Mon Sep 17 00:00:00 2001 From: choidaye Date: Sun, 29 Sep 2019 21:46:14 +0900 Subject: [PATCH 12/17] =?UTF-8?q?=EC=A4=91=EB=B3=B5=EC=B2=B4=ED=81=AC=20?= =?UTF-8?q?=ED=86=B5=EC=8B=A0=20=EC=97=90=EB=9F=AC=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/song2/jeonha/Login/LoginActivity.kt | 37 ++-- .../com/song2/jeonha/Login/SignUpActivity.kt | 174 +++++++++++++++++- .../Network/Get/GetUserIdCheckResponse.kt | 9 + .../song2/jeonha/Network/NetworkService.kt | 8 +- app/src/main/res/layout/activity_sign_up.xml | 78 ++++++-- 5 files changed, 273 insertions(+), 33 deletions(-) create mode 100644 app/src/main/java/com/song2/jeonha/Network/Get/GetUserIdCheckResponse.kt diff --git a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt b/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt index a2597dd..4acb13a 100644 --- a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt @@ -33,7 +33,7 @@ class LoginActivity : AppCompatActivity() { setOnClickListener() - setTextChangedListenerEmail() + setTextChangedListenerID() setTextChangedListenerPassword() @@ -64,14 +64,14 @@ class LoginActivity : AppCompatActivity() { v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) } else { - v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) + v_login_pw.setBackgroundColor(Color.parseColor("#2e394a")) } } }) } - private fun setTextChangedListenerEmail() { + private fun setTextChangedListenerID() { et_ac_login_id.addTextChangedListener(object : TextWatcher { override fun afterTextChanged(s: Editable?) { } @@ -81,7 +81,7 @@ class LoginActivity : AppCompatActivity() { override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { if (s!!.length != 0) { - v_login_pw.setBackgroundColor(Color.parseColor("#f3505a")) + v_login_id.setBackgroundColor(Color.parseColor("#f3505a")) } else { v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) } @@ -123,23 +123,28 @@ class LoginActivity : AppCompatActivity() { override fun onFailure(call: Call, t: Throwable) { Log.e("Sign In Fail", t.toString()) + } //통신 성공 시 수행되는 메소드 override fun onResponse(call: Call, response: Response) { - if (response.isSuccessful) { - - - response.body()!!.status - startActivity() - - - } else { - var resMessage: String = response.message() - var test = response.code() - Log.e("login error",test.toString()+"로그인 에러"+resMessage) - } + if(response.isSuccessful){ + if (response.body()!!.status==200) { + startActivity() + Log.e("login success","로그인 성공"+response.body()+"/"+response.code()) + + finish() + } else if(response.body()!!.status ==400){ + Log.e("login success","로그인 에러1"+response.body()+"/"+response.code()) + + toast("아이디/비밀번호가 일치하지 않습니다") + }else{ + Log.e("login success","로그인 에러2"+response.body()+"/"+response.code()) + toast("로그인 에러") + } + }else + toast("test") } }) } diff --git a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt index 9403875..f0f239d 100644 --- a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt @@ -3,9 +3,14 @@ package com.song2.jeonha.Login import android.graphics.Color import android.os.Bundle import android.support.v7.app.AppCompatActivity +import android.telephony.PhoneNumberFormattingTextWatcher +import android.text.Editable +import android.text.TextWatcher import android.util.Log +import android.view.View import com.song2.jeonha.Main.MainActivity import com.song2.jeonha.Network.ApplicationController +import com.song2.jeonha.Network.Get.GetUserIdCheckResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserSignUpResponse @@ -21,6 +26,9 @@ import retrofit2.Response class SignUpActivity : AppCompatActivity() { + var cnt = 0 + + val networkService: NetworkService by lazy { ApplicationController.instance.networkService } @@ -32,22 +40,182 @@ class SignUpActivity : AppCompatActivity() { setOnClickListener() + + et_ac_sign_up_phone.addTextChangedListener(PhoneNumberFormattingTextWatcher()) + + //값들이 채워졌을 때 + setTextChangedListener() + + //될까? + if(cnt == 5) + { + //버튼 활성화 & 통신 + btn_ac_signup_ok.setBackgroundColor(Color.parseColor("#f3505a")) + + + } + } private fun setOnClickListener() { btn_ac_signup_ok.setOnClickListener { PostUserSignUpResponse() + } + + + btn_ac_signup_checkid.setOnClickListener { + + GetUserIdCheck() } + } + + + private fun setTextChangedListener() { + + et_ac_sign_up_id.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + btn_ac_signup_checkid.setTextColor(Color.parseColor("#2e394a")) + if (s!!.length != 0) { + v_sign_up_id_line.setBackgroundColor(Color.parseColor("#f3505a")) + } else { + v_sign_up_id_line.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + + + et_ac_sign_up_name.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!!.length != 0) { + v_sign_up_name_line.setBackgroundColor(Color.parseColor("#f3505a")) + cnt++ + } + else { + v_sign_up_name_line.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + + et_ac_sign_up_pw.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!!.length != 0) { + v_sign_up_pw_line.setBackgroundColor(Color.parseColor("#f3505a")) + iv_ac_signup_pw_check.setVisibility(View.VISIBLE) + cnt++ + } + else { + v_sign_up_pw_line.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + + et_ac_sign_up_pw_check.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!! == et_ac_sign_up_pw.text.toString()) { + cnt++ + } + } + }) + + et_ac_sign_up_phone.addTextChangedListener(object : TextWatcher { + override fun afterTextChanged(s: Editable?) { + } + + override fun beforeTextChanged(s: CharSequence?, start: Int, count: Int, after: Int) { + } + + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + if (s!!.length != 0) { + cnt++ + } + } + }) } + private fun GetUserIdCheck(){ + if(et_ac_sign_up_id.text.toString().isNotEmpty()){ + + + val id = et_ac_sign_up_id.text.toString() + + var getUserIdCheckResponse : Call = networkService.getUserIdCheck(id) + getUserIdCheckResponse.enqueue(object : Callback{ + + override fun onFailure(call: Call, t: Throwable) { + Log.d("SignUpFail",t.toString()) + } + + override fun onResponse( + call: Call, + response: Response + ) { + + + if(response.isSuccessful){ + + + + if (response.body()!!.status==200){ + + toast(response.body()!!.resMessage) + btn_ac_signup_checkid.setVisibility(View.GONE) + iv_ac_signup_id_check.setVisibility(View.VISIBLE) + cnt++ + + + } + else { + toast(response.body()!!.message) + + } + + + } + + else + { + + } + + } + }) + + + + } + } + private fun PostUserSignUpResponse() { //edittext에 있는 값 받기 @@ -66,7 +234,6 @@ class SignUpActivity : AppCompatActivity() { - //통신 시작 val postSignUpResponse: Call = networkService.postUserSignUp(PostUserSignUp(input_id, input_pw,input_name,input_phone)) @@ -84,15 +251,18 @@ class SignUpActivity : AppCompatActivity() { call: Call, response: Response ) { - if (response.isSuccessful) { + if (response.body()!!.status==200) { startActivity() finish() } else { + var message: String = response.body()!!.resMessage Log.e("signup error","회원가입 에러"+message) + + } } }) diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetUserIdCheckResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetUserIdCheckResponse.kt new file mode 100644 index 0000000..bbb279c --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetUserIdCheckResponse.kt @@ -0,0 +1,9 @@ +package com.song2.jeonha.Network.Get + +data class GetUserIdCheckResponse( + val success : Boolean, + val status : Int, + val message : String, + val resMessage : String + +) \ No newline at end of file diff --git a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt index 7544a19..dca4c2c 100644 --- a/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt +++ b/app/src/main/java/com/song2/jeonha/Network/NetworkService.kt @@ -1,17 +1,15 @@ package com.song2.jeonha.Network -import com.google.gson.JsonObject import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingClassListResponse import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse import com.song2.jeonha.Network.Get.GetHanokListResponse import com.song2.jeonha.Network.Get.GetHanokMapResponse import com.song2.jeonha.Network.Get.GetStampResponse +import com.song2.jeonha.Network.Get.GetUserIdCheckResponse import com.song2.jeonha.Network.Post.PostUserLogin import com.song2.jeonha.Network.Post.PostUserSignUp import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse import com.song2.jeonha.Network.Post.Response.PostUserSignUpResponse -import okhttp3.MultipartBody -import okhttp3.RequestBody import retrofit2.Call import retrofit2.http.* @@ -72,5 +70,9 @@ interface NetworkService { @Body authorization: PostUserSignUp ): Call + @GET("/user/check") + fun getUserIdCheck( + @Query("id") id : String + ) : Call } diff --git a/app/src/main/res/layout/activity_sign_up.xml b/app/src/main/res/layout/activity_sign_up.xml index a755476..f8e65ce 100644 --- a/app/src/main/res/layout/activity_sign_up.xml +++ b/app/src/main/res/layout/activity_sign_up.xml @@ -56,11 +56,10 @@ android:layout_marginHorizontal="53dp"> - + android:layout_height="wrap_content"> - + + + + + + + - + android:layout_height="wrap_content"> - + + + - - + + + - - + + + + Date: Sun, 29 Sep 2019 23:23:01 +0900 Subject: [PATCH 13/17] =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Network/Get/GetClassListResponse.kt | 3 +- .../jeonha/UI/Class/ClassListActivity.kt | 3 +- .../adapter/ClassListRecyclerViewAdapter.kt | 2 +- .../song2/jeonha/UI/Login/SignUpActivity.kt | 8 ++- .../GetMyBookingList/ClassListItemData.kt | 2 +- app/src/main/res/drawable-hdpi/naeshi.png | Bin 2589 -> 5409 bytes app/src/main/res/drawable-mdpi/naeshi.png | Bin 1588 -> 3425 bytes app/src/main/res/drawable-xhdpi/naeshi.png | Bin 3588 -> 7340 bytes app/src/main/res/drawable-xxhdpi/naeshi.png | Bin 5461 -> 11386 bytes app/src/main/res/drawable-xxxhdpi/naeshi.png | Bin 7397 -> 15756 bytes app/src/main/res/layout/dialog_orderok.xml | 59 ++++++++++++++++++ 11 files changed, 72 insertions(+), 5 deletions(-) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt (69%) create mode 100644 app/src/main/res/layout/dialog_orderok.xml diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt index 8239e96..3e6fed8 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt @@ -1,6 +1,7 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData + class GetClassListResponse( val success: Boolean, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt index 6f0c59b..5c4caf5 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt @@ -9,12 +9,13 @@ import android.view.Window import android.widget.RadioButton import android.widget.RelativeLayout import android.widget.TextView -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData + import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetClassListResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import com.song2.jeonha.UI.Class.adapter.ClassListRecyclerViewAdapter +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import kotlinx.android.synthetic.main.activity_class_list.* import kotlinx.android.synthetic.main.dialog_select_class.* import retrofit2.Call diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt index 66058be..9295924 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt @@ -11,9 +11,9 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import com.song2.jeonha.UI.Class.ClassDetailActivity import com.song2.jeonha.R +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import org.jetbrains.anko.startActivity diff --git a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt index cd360c8..d42ac15 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt @@ -104,6 +104,7 @@ class SignUpActivity : AppCompatActivity() { override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { if (s!!.length != 0) { v_sign_up_name_line.setBackgroundColor(Color.parseColor("#f3505a")) + iv_ac_signup_name_check.setVisibility(View.VISIBLE) cnt++ } else { @@ -139,7 +140,12 @@ class SignUpActivity : AppCompatActivity() { } override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { - if (s!! == et_ac_sign_up_pw.text.toString()) { + if (s!!.length != 0) { + v_sign_up_pw_line.setBackgroundColor(Color.parseColor("#f3505a")) + et_ac_sign_up_pw.text.toString() == et_ac_sign_up_pw_check.text.toString() + iv_ac_signup_pw_check.setVisibility(View.VISIBLE) + + cnt++ } } diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt similarity index 69% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt index ff01e10..265189b 100644 --- a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class ClassListItemData( val classIdx: Int, diff --git a/app/src/main/res/drawable-hdpi/naeshi.png b/app/src/main/res/drawable-hdpi/naeshi.png index 50dd6247a5771cebf31263faeaa24caa15cb4a55..03b0c699d0e02fb2246e1034c76a8165945ea74a 100644 GIT binary patch literal 5409 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 LNkvXXu0mjfg`rE! literal 2589 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 diff --git a/app/src/main/res/drawable-mdpi/naeshi.png b/app/src/main/res/drawable-mdpi/naeshi.png index 6f75bbd37387c724181183ec35fa6c2559d8abcf..a6d3ea90bd06ce0691d453f3cbfd1878f2b575d6 100644 GIT binary patch literal 3425 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 DJJo$! literal 1588 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 E0FYL{lK=n! literal 3588 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�K~^Ku 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 literal 5461 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 LNkvXXu0mjf4jx%q diff --git a/app/src/main/res/drawable-xxxhdpi/naeshi.png b/app/src/main/res/drawable-xxxhdpi/naeshi.png index 047ecd883144bca27413362927a5c83563e6ff59..9bfa3dd1864d295a478501f81c7b5a8b54da43bd 100644 GIT binary patch literal 15756 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≥WobOOd21*fZoktkr(@jmnKYe*!#CUvAco*s=^pOSAaj_^NO{aO1Kft z{zd41t`Pc^EAA&*#HN0zYxWzt!}QEA=W$|_-_tJC3e>-|jml#(A$Evr>xk`z@Ah7s zjvi`sY^rH+IfA7wVC0xA$DQjllrhCeO=*89YRQm6!%=8sy{lT{Mf%E`h>4A%O>auA zMQY~1JV9?S)axmVa!4 zEc;EC3{*@MnCdf&ZX4t!#gH)k-Y2K$A#}kg;P4^F{~*o}godkHl=%0yUNr1+jJt&pO`$`lqk|wUVUvypKOdu z_l?t>z^k9)@~ROLj=>6I&P?D}{V`x%#o3`+gTvsJr;BB23eY4u%IAX&_Jvzm6O!`Q z>TP*!9YE5?drFw<<&Kz%^hM``u<=C-6qx@ zH(dRXBXEJQ|)h-q+%L{BREofnqS^4k?IiQ zJEmM^Hy%uWsD8x#Hk_^XhZ~3)oj2O<231PGHf?wYu0(i6Ze5v|1BK=_8IB7RJ`XZD zSl+5}m0WQ}S?{^h-e3Yn9l}jdWBI$cdH+l+HHyUT&-0NZ9$Vi107z4sW=%6l6~&4p zmIh$i?*+M?^7uxWtL#J$2!+HMk+rB09#ieKIwz;BWvAXWvz}}oQKQK;>J)S4R}K8-s2N>OzzJAW~n>%>#%U^{a$QAT!jd>wa?vXjez=`{gN zM`LsG0h(`%{?jJlfG(kwvAX3zc<;s^`d^g6-07|O+%-aoaVZCzuTQCA9~TL81u$T+ zSejXwr6(I7K4-tj*!g3Gk6$o;h4%E9A~G|B3o7+`{HK6hB=}3o8+6Ex4&#dS{8gy3 zEO)Jti58@q@+JP536mG>C{%VnBtTnGEzuOz6tjE?mww*$+-vb7L|kfp8;COc(Mrvk z&7FbxiU^t>Rsw*aX_{zyK>svH?D|5CF;QknJbI7r6_bCBeoCoWOBBguzz7{rEl|dDV=lyNvH&S6M#ZgWXW$-qyW+Zhax3xalWFtS0m! z6t#HF95_3Scjcveo9AJ?P1*u}f^H^$rRhe8J-?6b9|Vz_9Y)g7lfs*KH%;*R5B3|* zl;Iu?|JEFW6~G^IV?CW%bL}Ur4LjxU8=6&&`NdE4v7iBmz@8@LI|Z49cl8EgI^#^O zyL|ttPXUuvmjEv88MEfF99V+4z&d6E`ezhOQId=F2;#ngFDT zhKOq9yQTqX1oBqLPgm@S1nkI$5H%qb@B?K)CE!q%4EIU&bZt`?Zh0{8I_`LeqzAhq zfa0yhGJM=yezZJd*oRgpH0uP?jzASD@682h2M)=@t;uV;rI8ZB{5&w%|8Gm6&O^ybO*8cdCLBJ~El+|fHx1gUQl ze4LVVE#0|-Jv=Ti0o1_p-m4SPtxc(C(Vt1Rer=(kRz4qfxE;A`uqt2ZSm^oz7GUYo zfOt+=kh!S)#HtnYD`fAHE8*);zFrGHNU;Shk;6y@*WT8hAK3h>&DL`&wR}0|Wbqb-%tv~9I$c@gkM?Hbr!qm_NsYw>7&22qzxaWy~Sr2*rMCi7u9m)iGkBh6yX^e;KOTnV@~ifcXA%f69?X zD^_Jt*&q8f2rz4$e$}|Ok-hND(Tt^!I2k~3R{Lb;(^^Gi+mVWc7(@2n==L(-G$5OG-D#)nIT&WFh9D$t;mzaci%usOr6r!NhKFF%kni*v z!FC{Xwvie@H9|wj4e{PR3XA5dN3EFos;%VCD=nAtG=Mf0)jX$bR^gup>Rlgz6E#yFqx&Dz6-#Z-z<`9L2VGyLi1l zA_0_%P%<_H;HbGq9ujqpf5`Tpovp$DS$$a4Igqe}k*Xn8528ve{Xw8nU{5fE%ZMZe zok9lxW%95``V#n8Fi`+v#6Q2}rwH78EtW6m2aYlT_D?CV%LWy@`7mSfmlI?Sl{pV6 z5}eoROKcW~Y7_-~!G5J;M)HDEkN3FuHN&OsuzRgg_+jF}0ouoc`go?e^qg-HVs|l= z_~6mki+mxBe6z_&^?o(BPle44<5uospkz2kh}LMG7di}F(Wvt?%;ATU4?6pDWB}1n z1?EVBvywf8-dKGj0NNbpfJkvNV3?oX7o7_lg3cxdh6&+(N%sfP8z1kl!w)zcig!0G zq$nC+&x0`y=2NTFZVJh#4)Na=N6r##a4>ghqL7+a1$!HOn6Z-(54%=;Ee_p=evUHP!rl^ zyh5%fVriCpEklTM`fE?kGa8dxdV^45F!xXu3~vCr=- zkeHaae_#fPfF*u=ibX4=V#MbENvv#nA`+!i8kFg+;mC=pd&eaIcBv-`a%rES!T97_Qncg#Evk2jRqXQ zHfF{~7I8pnUw^$q!<~?Vy$abg(u=bXx8EP^eqQkC;9%fkb|OSCnU&akP7Ov*AF9_q z$^JJ!Jvu53A)u|QqQD4fLqf335*1SK=Qg~es#h~-%Bn99vq|73*^7qak3uRGo{4rk z>$4fpx~~tiU--gTt**(r-&QkI^P2)i4k66Z3`@q;Zul-Apgrw=II5YAq~I>T1P(Hx zq(bW!d-^O<3zqSe+6XMJu3ZeIaWD-%Ih0(2?R?oP{?Dc+6h??29#CXjN=B|cJf;T) zy-_nC9rP>rcH319knMk%-@nnjqzJOZAbfLo!cOFxGh$_dG#JV!_^bN8+VC@pfxYm& z8>62#r&;DsB>Z=N!Z(^F9_O5GWxmme_)MMzJ^1@%ufdN)2KgSHcT#o8W25#sg8Y*lgyR( zwNe&ez{xPXDh*Oxn^QowD3uTv6(9)HbMuS;EtcJTqU7;ojom`-?Q7-^AV58Dl!2lr zp1%%nZd{Uy`5op51);(*^Ckwg&fNDfF1taZG>y7qF4iwySZoBmlx2H}MQtNYq{Nfb zoCSMfda@dCV`5{U{TiPZCadQiTiDtxWtJ@C-nCa&{v{vP|AGF>+}r#5_eeI$QtvA4 ze;{3*hQC=psLYjT9q2G|MaFM=P;e?|+--(*Y#&?$HQtOnln*|~+N?_3snkYcXT`p+ zz{=_cVdCdw>qE%8I{B=QjUz_O^YQ2rOc(ZGP0y0Vk;&*bTzmT~-m?p5X@T03N!X}#pE zEE;w`81?oLvyF|;zSe#8#G22(cK1ZjRxca`rhi=OW<&@$aUc&D7Z;nWAEPjzIaXaM z6+?}X2V37b0@3D!^0&j-9Vg40Y)w3K^IdwUs|1gK za!f;>_fZp$Ghbttx^}Y_x-qU%QC@PiC((3-UNDQfEWBVS6C$Nq%KZ|iqXmFWE+I#c ztgLTti=3!`yvsCB@2*uI7bnODW)Nhu@7XTydGZT>V8t#>(JmP}FX{RI!whk;9ZtrO<@a#_~%pl?ExL)CWSiWrcoC){A5m>EX+!FR>ciJv@( zz>ghA2)X;OjQiceElR8BV$XHjaMg0{bX*>a-DXM4l`!=p_$wLyG1V1OPu|6dl{vNe zu~VCJe$wG>pO#SbFdqh=LJl~#r59Z{#I5m_|0BGO?==B|$-7yMIJ{E$mD@6j=z`D= z{{A@^z`iC?$xU)Bf$GYW8kN$7OoWDjFHpTWD%Hc+=k5(S#@u5G8pv4*#z2{Y_n{XZ zu?dR!s$fsKk$9z_^tlZ~y<|Tuf#AE2G%ak4jRg2Kof1u=RxMa7FO3OS+af=S#AR@Z z5egs}ODPIQBUYYe9?QIMfG3)mbC;NDJ);{O|I!d9S^l(F?QVvl4+I<`rXW8SHnk77 z)EK$j&H4i=DSjvZH|t6i^1UPw2HCtG^UG0ZR4YRFbFFV;#<_N`NkRZGNnPnhY2U8W zmm*w1MJ-`}PKF3!vkI}5Z_G7I>Kid{F}-w5#KA0h<+%6|%#HAA_ytiFA6WtwR5&6h zgmr8jx#gNl(v69pyp43r*ILjhcDk?A8qyh-P4l(;6ruB`J{gmN`$QbOwf$qpLOc8F zVmrEB8E3$0%3Pm9(-(CjsZwCWKZ~mZkfwAGjYT1Li%P7o6>9#1FVoI@pj)= z;3$_QA69>N>wQxJT+ohvqVe33bf2`K_B`vKz#k=XoHgeJ88nmYy!NmrNcOC)46Gx4 zn_V_6vnZzTN1@!3Y7)Nrk?kIxhsCJ)*QL>)-uU`?V3!U}2i*(`{ z8Q0r9)EnFoini3xU6BHfy*%SsOXQX!W`=1Q?uAVZz~|XM;U)7ns#_nfMgGxfd*_;a zkc&Y~kuX~h6i}(>eJIlrU#n;oX;qz~&=_WDboB{aNWq7J)1X>4qU1!~cSTZcU_OzD2W#NMI0=)q z!+flG2)GOcGmi)1QLjV6kT-M0I{S$-U!ClGk`t2-2%Honk3GL=IJ!nGIQV3mJwx_g z8D>#F;+zcQdXSDtZj%z}7F96q40dfU=FETOj`5nNB|ln)r2-zG|N*j8xn>U)BwNjO5=lf zm^bT`nH%Inp?oza^Q8a-sbfvRFQSC++*OJd7`@`1LZ0@U^;&1#M z9YCG>Bk`1oVi9vDu|~>LF_6=nGqjB|H408f5;s~!_9&@YujI8>+3A^A9N&$QwHxF> zFm-An=o)k-4F*i)C`#@VReP&OreDxAuo+{=3&m7>zf^nH&C^E7|imA=fz(i2~n$G^5KG zK5TwW!Si~)NZG-LJ>#p;DIajpAJ`Sw%WaMVv^96=mb)k;#-xdX5BXY?OPb=h1MmzZ zm`u?T&&HWlhx4(?@q&(pXVn>&e6AO~F4ZNs0D;s|Q`QPWRLq&yEV!{y>4bNMhJBIH zcJu3z323o9@#wAT@1*uaNqMv&d!M(^FD(lr?K_e)9#nzZgX`jI6QC%+BN4G*>ThHX zyWMntq5wJnxyaZ;vDkSi>P=l{`kjpU-5@+aEitF`C8I$n7KU=1ZhVn$(Ofs;=t!Fy zx4By_0lX9ak%41+z0M z*ya%OzC58QSq3Z1XQ^~vug{mOkJ6qwkkB^i;EAeZKRiOzosEo4(pACRo(G=ZCMf?7 zC%v*|rOTg;)d@O!3iqt}Mi|W=nwz>4x#zP9%wFzR6Te~Dj1-Vvv|Ih`m({QR&<(XQ z1Y=QT+BFMAPB$UvRAhd+`n!E0xCZL$^4cbvrFr~?^pN7X_XsAm*)F!Rs~) zw6?d{7i!t=<{u?he_0Ea0#}AZ(R4)utkz}&4OjbyGe2aH2oS5yVXpc0^u$)74LL|4 zC%dO=K5y;agk3o3Sjz;b<@>t<{k1*bR0#|HR^`^lo(q_2GJ1w>6i?8z5;xkUkDwbo zqZVL4L(<|73^t7z=_mcV$}`H-a=0lxHbb);UBd~UN(?AcE`te{M_wuNCIHSV*3|;;W=BfF^lUxs5<0(iFwRTyA2NC zu6fxTWm!TNpP$7#>EI&JBNx}VC)?04qL^Ie|1Rekg2(fq(n2Gk3(d9)S)uwRZ{RBq z(sy$F_--<8lEE=!kyAy~&b7jRzJo~xIRxC58!*r@b_`42D0?q3A1aKp<%A7MCZZB0 zI?>6p##yySl^de~-oQv~760pE#`9&*@YYz2IS<#kVo&#=K4XUsU2X-@^&EfN8+&DXnGwZX zv1++XGlrdBZuuslS~`18kp%9O8Wx#CIG2zD>+S$Ow5!5y&0zln?V}D4vFv8wPEo*& zw;q~4SYXfgmh%f(nH( z$9-uklT5pa^Kwh2Wr~0D$&*@aCC2OdFKx2Wv7(2Y$9&(YIG zT8msvL};^rwPGLzskJebT}#q;j$;4he@d(z`oZ-ElX0*;t!s5KCI#2~Zbes zx`{5dEq2UUOi8+6{aDQaWc+tbMH&U zqX(zW0fRtlU#^TNe+&hy`)=wV%}`GJ3T*@a`q;R-8t$JI2oj0u>AA1a)n_au-!XOp zm;K$mp^ygd!-$i+cL)!_4*-b_PqU?b^Mp@;)e;rfFH`{zz}f0~bCswtJ1N2RkOzA0 zXkBazWg$bVqCB@nvz4>|o*oLw?@cgC=&%Gpl32C+HuLV%VOKC&pw!Q2g3nW#LG;3z zBLV>e^N?&ADEsIcxBkW;Y1-7`+}l}31igq{f^w{cVb=?lc6pq;tQS$tZCb2bE-f2v_w)^?XB70zCZ%N}l|X+vNt> z%`Kz}@d<*GVStu^@SMZo$C+HxhdF_I&82clkk62&8_9f{7r^99U*ALT$2V>-q0!@P z->P;qSRK4P%{G6lztyg2!IIx&APEE21nyIUb%y^@Yd0EJUo5g23j0?dhlmF@LrEUZ zt~DD$nQ2&_6=zGUW$Eg~H?y%Herr!KMmKM+)l3wGR-SYX1;U0o3dqR)mRmgv0MDhK z4l~Pv#1JVBZ0wUjB6|K<#ibI2VCKs1i}7*>nz?ZP8{H_^otBl2@og5QBn=aVv670| z)9rPUIk|<`^xlM{MsYDm_y8U{fhjcLXzEm46_WQhvv*K@RZ8h)tZ}}K!hmR~TkBoe zSqDDO1(VN2(WvlpK78&t?NQhdEl2{kqRLfoTQqiJD1_zJDka5u4XU6rA7}Va<_jti z0>}R1P^0=nEsq^&$;NZnh`@;W3p`lnFCfKtC2wbs&90jfzfn?O~bvShVgz0gFG~ zZC^v_rW=TvjYJd_qVGRmF0^OvxBD7iPGUuRu+i8YiNt!D;H+Aqm=G|PAb7xBeU>zn zx)Igo;oP0=^^g!IlZ5bRBd;A{vTcbRee#ryJUq;QBAU4NS1d6J-RNOBV!1^j#}!>N zj((CKnBjE@sR^N;fgu_mBk~ea$-RSXiPq?g<1orZ_6pvJL|C1S<>ldP;{2RZj}w*H z{9TyWMo3KCikR_WtgQ+?bu>xuzZEe%xr@qAn{&N$*0|7nnkw4EbPvTP1-^CEYrT6+ zlo5b^?7aeZp+AqQ|NZpFE$6NxV)N#&6lN$7BE}T^$TyYGXkIEmLjs%hTi!4m9{_e@ z8yWhSy+9~;P*v3mos!RpUm0}4cfHGpQK!vn$Dyi&Br+AKO1agU<6QkIjWpqn3qrAoc*RPu@^cqqx)86N*ma$ zH)6@+yg)7B--dYJ^~K}^wTn=DZeeQRc%RMq2Ox6Xn)*q?obFv-GWo3?S(liYg9GWNij4mfAHyMna~?Tnru5fcwYDWw@X+y6B&>c`ulK<{4RlUMSMb%LM*h zZHng2v$${r%F7dXQ~3%lCOtG}EU{4>acFWHl3Y4FUeF!3Tb!pvp2GeDpkJZSpov^3 zdjM?eMD{Ca_hvhZ-~zfX9cSy%J$Y^j7|Nd2LC-?qK*UfO`evyEWZnq)?!{PuG^rmL zZ4Qhdz6~Z~^jW@hGwPTR;*v7gerSN1x+^F*P_wt@+L?`lDR*x+)9qOar&>#7CnM&B zb7wFG2c%uUA`IuH0-fX3y|NVFP*XzPOzFbKiB(+U_d{*VD~?VKLJ&-2R?q&UDSFmC zD8m+p?ip+^G>d6duLhSaMHIP%*GNLbr5sN4-BiouJAs!t=b85-4d2Pk zW{!=9lsS#&mBnOe@q4WI&)lkXN`iIL z3f%q0K$Vg*V6f_+m!kkV9i23dCR?h^FDOMrD1>>Q*NL2`P_I;o{PkQ0(148rpdFQP zj(2<{+xI_tW0;zeI;6dy^kM>8SI2nqLdizK{@d7h&bm1y9(^LS z-;J0kM0Mz-0(~d;%D?3(VcMc zUk96d35r5uY~Ld4p5rP6QkYey9LRiMFVs-zlUtx)H_cmUpuDhFDh)#Pp#RcxAig9h iu>U7T7&Y*dD8zPC(~#N3{p)x&n6$WpSe1xT!2bfiihB6~ literal 7397 zcmVPy6pGibPRCodHT?c$sMb@9W_mvbv3QAY$7EnqsDhb7g5(oiJkRof)b^Y9xpS$bs zVmJG_y8F4Vu5J^A1=a>cDG5z%KoU?^2uSEs1nH1M>MQro_n(*C$9?b3eI*B`C7jjV7eDRx4-*Q%^j4O8PQRc5s_COa6Tcv1y* zuuwv*R8q~9sxg!}5@e}1hDxWS2ssifOQjtw=5-UKwx4z`m{ofbSDBz17l&hD>?`T_ zWu9_4CLMRGLykI?P8F&uhqH86LRlBHsiuor-qC@YR&@$qox(cH8ys6cXa zb0zi5Zyr8wS0CMLclHan00J?`1OZ)bF;(`on3i{yO}US(TDU(DO-sjL5P`fpIy?Db zo$}^RhdrfCQB5sf$zakqQ^NXM%%}RAEpva{E%A9eYnCGzx^UyPsz9E+J!{G_#rcO) zhy5yrT|Da2o2gw*CdYs%^Wy8w)<>tTc)#2`z9qx0B9NEw&bnuZ&GD~No1=Y8RwmqO zUna}Si0G(-?5Mb(T$BIrs&J<-O0Pu)^5W?GuH9E#zjT|;(HohEB`;Z)NnD#)65lqC zw8byJZ5v`Xo5{Iz)ui&=IsB?zKf67A8mEhFa@-PadG)z9A3iN&VmM)8VUl-&xW)AB zo!RevQCB|+W~$^JA57R}l1ZOlJ;)7xuO`>y*Z0~!>;hReE~nev^0NQ#aX2pv zwLI7K=}GRsV>lUb{k7!UYkCo@#S&@~0r3xhcZ7ViV-NXqQwjNe{RU#QVTKcei=&if zw27KIBH`o;g#ww6MM&^ReI@S3T)>-AcxdzLQ+tyGL+DVZy4a zswOMetR+hdJ|=ti9SAyA8C-iQDRK4P37xX&JFnIRO&A1X*aT8OAt#rq?D;#6pQf;& z0=kss{v<1N6uEWSEf@nXyyd%d_qSxp@{h@ikG~+bwRHi@pBWoXewol_msv938@F)w zu7CtVA~ahdEH~FwQF>@5BkVyghue;w_M3G_tHpL}?{06*nECqKK;-#fRKKmCtnV>% z_B%5+et)cMW7&lD86F))aueeSrKDVvXnOp@d0z?i{e{{lhhMZg--o=^0Ig5itt3R#p9>8cRHO9 zqV0`@MRQ#zlbm#!B$-9H!NMR&^?RpMU8b@_bt>CfFFD_xT##23EdBcIY1f^tw=Jtu zlwKWWiS&c@7bV~vgzkV~?oP;?`+2Zwd*ca`^+xdw^EpPvglY5foa!0l8A9Q zlsD_JXN+&?y|MS*6Q@XzcQ#3bx|`)#R4U|h`KIb0a#~fK-#L|oWvcp7v=sYtW`LPE zn?BuIezNKfqOwQ)rHryym?%w+%bUB?AD&TM$Q3Wk&Upo6#&3-hY=o~#q_OwXynjM- zh~1pKCfwS=B0twtHVx@ulB{B^)`8Zeb?tUI4}7mW=S4-cKTgQY<6A63SDu~oIO_j8 z^q(Q`&=?PyO{SaMd@%c@FcCjM!$d_i6 zub}jIeJ!RA{wk%V*V@n1s_H1UJM(Q4`Nib?4}=VbiT@ykGK(?dXTOGimDsOa8qLjh zhEj*11yVlwp{s~p*$VSE!6*ZC*ZI(&)6hbE2GF^qC;Vx!**d+8Noq7rj8eHc;23Mz z7Q18PZtA@Mw*|h&2ydL=#rvqJ;Uo%;^ACxO=06uoje-&g%U&dxvz6-!VM7cPr*vgv z-)@=SEn-3Xq(^$08#nWKDZSCF)y7#m7jf z$g(u7?Si=*jBvc+K?$Thd)n_&uIIgp&xg@HlPtGEO}Y20-yD^FT|cuqe}Ki@^E_VY zK1^8DBTi?$gW_!oEZQ``$t6DVw66V6ypG4N+^`Dy*|rW*tqE)R8jQ5vFf9 zX!)**620n5liVRulA5(Jc1Bh0g|+q<9$LNdPx@MvWj*j`gny%l>HW|e2NGyZe}Cht zC%!%;@K;XG>8(1*4(NZO=?V38(i9bSL)<%WozlqBEB-np+C04t)fwtqWPm5;FZL6P za-dRGHz>07(Y*uvtnu!30g@0#Zy5Vfuj6Xn{g}MmaXFRxLP+r@a7&2n2e{eh*mu%N zZ@Yihd*5?3OaY{d9fv*wf5sV+fk$s7=FR)1QM?`=ut2aX@{w7Fo=Ee9m{D22J7M9! z*Kk;JMn+7IJ$luYxaeUTPB70}#*|%l=eEO6<+X=aEqpH+n&#rXGU~pb-6iS8Yt5!H zFte_JlDKHDtGo73&FCvL_Ti$AiPt1a=V!1YIt{kh;XHFfWwSEdSze^` z=3yRrVce?Bsp&FPUb@aK_s7v8zdX@O_)$%r^3TfJ-<51w{u+l>Onl&W<|LmOS&k6O zQuLDX8okleFmu;ze8-_}Fz>Dt5>rx|NV+G}yj=Uhp&7%OqAZJ*r1*l4?S$xh;7+^q z@Ftu3$ge;CV6`58q5T;5F7GJGGlxW5Ghqt)ZB@G*4)XKU6?``GR-ewXk70dIfjRs- zR=f>W6O~NE6Bo^aab)Za1%kbeNs6kzZ$v7Y$Q^t!t$%9z1mOG!Yg$&mPq46kJJJrz z3nGVgu9`iH^2EIbAIucRUo5cvjH%t*5M}8=tND7P7XM|vojg@m=_)c>|FY=LF_ShV zCere9+g|XZi?A+~7ANJ+OB2R50>zv|BvjR}j0j=QCikDbLFJ2(!?8L_{!TXWx4K%u;lrrC2&Jo~07vz#8H2 zN{W`h0U<(mKWvvgEc1F*aV$_75s#^j)#K`GO~<5JklhMVjd_E%SS?q@zB@~Jgw;o7 z)lQst1;jK?lo*HosjT)3qL4)agmI3_(x|P)EB^Xp5C*UJ=Jm_ATiPb_y&u0z>s)<} zJXtmlJS^pO-VX6*yUp=G-f%7KBM_UD-3uZgI43x&u=T5JYyO7b10zK2Furif4=*WP z?y}LvSU*hYSF7GT*QZPDDAdu=*x@yUrS{13rvrlw^sJ`9SvA=`wE9 zCW+!X487qnwUS%5Zdke12OJq6iOx*c5gT$bAO-?KTJbpsLnbO%YlvQEANPwFSFHnfw@G zTqu3I#5{oKr$+UwR9O6L6uioJE zVTruHrD%Dez=9XI^)e|4S2I?+Rk8l=8 zdETu$KO@!0HTp~Xbc%gS0KcR_Th_1G#i;Sh20s$DsM?p05@Fno_Hb^2IGNKYlFvwS zgvNtF3!p{RS|#hmAHtzGt;{X?+*Z7DCREH4qdeY&K+ZItRnu@_9{cdzEf5S69@f=C z9C%w@>vu)`7JfV@0hy!gT_BMKnms!<-xgGD%@Nv4q zu`BiTE|n!I#C7J%3EOw0XeZ1?LG7+g^wbf*AqR?zR+MAB{Xm4k^-p1)U5j#e1`cou zgi@zVAYWq<(QtK=vd?%XS}KueU=HBIqC6w4b&XamgyTC8Q6%aTNMW6aZu3e@j*J~% z90?RO_3QKnCW^vFyw&C;ReTkM@i)NEyM`X3;!qFVHwL#KU?Qlp>(5iZ~G+tJ8xzObv|xCDX|+!marC3x*igL^(1DaKyM8Bbs&6ch&}$*>`p3OayG zAUIe=akkbteaecBBO@{XI6z61A@6X4(}%P{AOM%*Xrz(DZs10vxCq=o2TBU_PGg^G zzX)p=dI(otdgm4hk2G?OMqhHffkwP&8k`FG$5((4;ozO#xdn0*Z@35@r3bi_g>eyJ za2%l2P{Vxh#dnuL6pSIKy*5wWIWe}=?T>hx!~s}QhCDp3c#b13fgEl+3UB@Z@}BDkoII7;@I( z?`SAH6mkh71RfmV3$nN-M7XtkLexWWTZ?Py#3Pl)fNGM2>-r+x2+WuR@v>MT=iIBl z4YV$m<&YG^*9s)23MFftbtFc_0Sl$>7>lBM8mnzclbS?n}f@7qSc}URgY(Apl#*~(H{~@D4fJ_AY!Oa#_vjmNUGR>mL z=S-SK&)=5Ocofu=v6Ns40ty7jvnP6OYBlB`O!7e$wTVd0%U@ilP>RyL{Ec!7sIrU* zBk-2tK!ZRc<3!7Fw+X4b1cL35vL?_*NW#DY7)=#=!^tI(wwFhh@`x~`A4wuq4lwpt zJ&8*oYxDA|B}pERh|l?@GJ1rFzhyXp4sZ;=XL@&u{ewOSpRHT{>s5Nhh(Ej>(5tEN zrW{Ev!hs(%2Ru~PptOuJ3R6=kqeraq@eBDqwLj*{Ux>O58kTVzK7Kh26Yf(nF_sTE ztXXnOUk;Z*__#43ZOn&w`SbiunYh=)D$Bz+tuHvJCy4l)&Vd1GqyLFpts1&@s2`g~3xmN4N}YVl(xrxdeiB zGH&wvI%WX(#f(4#aX=v>L?~Dh8_YiyrNuP}gf(0~qXD%ikmE;=oa%8GhZYxkhQOSo5TJ6OUg25Z?7r3)^HT*8ERylAzXvElFszZ4NWl2L<=HpwjiO4g) zF3#U0C|XFM0YlO=k>m_ilizW83|A)=w2w`CZq1r^TBUB#Lh)i2Q?;mQSvAHJSAASP z1b@cXlzHm1L7SGGZ~j>ppYST4M3+FY*CV{epHt&IR7pOm zv;Y7D-Ym{6@1y~X##YiCZ+Nibfw!e!h0iy=B*tg`${nYl632xX3N6%5lp?O3@#qW< z0%7EY2${pELasH63m1IAh;a#Ee2P(eXwChHj2z$IDBdsJE)9pOuo~mAk;ZZ1i9z|X zM98idrG`15#}QMPK+Gn2hX|R&(AE1H#f1xQQ5BCX&PD0kYXakl=)jCXJv?CEqI5%n zr3@X@9gH+Ej+h7UT>@z%CGA3A5bT?CTbW!RO6E<$ZJc}>?#V#^o*Q%LpnXkATc*<2 z{^*eQW`FVFh{MTu!$ysdg!u}D-!+SZ?H6T^L1*xY5xGI^y^E-WhoNB48DXQt=fVja zj1i3n-&|Bs1OsM`7WQ~jVxyATV0`hwY*s)e^cJH8P_|NioU4bp0F-RiM`(UN7pYV> zr)uGrdg7Z^|AL}@7CqJd`Y;*^zmY9>{GBOpG$&u#EKh+YvrL}`!pHC-%yA`!%XaGF zE#arc_q!}wKC;ZVX@34heH+}s)X@*Y8kwzy^-o+a{>s*(l{56Pmh$t#yS~@Ou;Y!;motsA7)3x4SFT8vKz2lp$#Vh%| z$nD&!NVU?{q+UEZBr44SMXLy;arJY#yM$r%G=7q4cNmiln3UaaSA5pI>W z?epbFxx~B?co-(>wF8EZZE>|F%KL{7!;;CvMs<*6b(MFVTObV))VO7;&Yyb|N5cL& zFeo+SW?&37z$%NEQZ{(Uc?d*i=6?f0sJAe;$!hZC%sbahB#evU3>z_wivNhNZFjFS zavmK&vb(&~mA!|++f%?Z*(_QGKliv3#CL+{)IRX9&5NJi#+Z4p}js=?|SqQj?Ad^mPX|Br0g-iHsk}pKmb^V z&of0?g4y^KjB}H){k&j6>KLpRUwDUw(mz7g2(P_D@A$&#n~y#MNi+>E0Ks8lm9Qqn zY_!EEQo_8wfLwh-2tJcZe7gNNSR3o+h2E;cHXefh?(xy~? z61)`}PMk(45Wa4NDg4t$i6XUb)l7*Tfbe3_z|^sW@%h?kyui93{cLM-{wF$sk5?!V zj#W~;A|ER&pZQR@0qntnY3Wnl!Asnea{Kspj5rq%UL1WHKB}L0U7811x{nM{N__xt1k$$Zw z@bJUxf~mRW#Dq+q_m>h&aF)@7$TdLEA2#rAO@jUYN+7+e#aP)CO31rh}OU_D? zDFXx3IX$t5A4gABhjTqY&f@`ZsQ?v!-jru2`-uxjarl^lqeb(ufAomI^eC17ytR16 ze1ACJaX|@$6S;QQs5HrF@15gdQ0s)_JRAC_rcdDEmUO*3Mf2D2dvRW=D`LJxORlX?jo}E^wz?HrCJ3p=I4#W zGOutb&i`!~D*`k+R0ND%Dz}rTH22^{vjoB!nmjaPkW*2X!P}LG133)D8>u8cRZ>{6 zE)ed8h{ws4%M^z?1C8u4*z>_1#HRGctwqaU2!|=&Y=Lm5-E{ld4z@aFF)G1#8-sLo z3kJV8JGJexVAZO>*@7f$F|@(M#tw8kozrnBZ&I*=K(DXG@@&r5q7`}JDp*(q!V8o9 zv!9vO(qqpDHSp<5522h!hkq9vogbF0TfQ+ItxT7^UvKizdpar1HXio+WT>W)PStRO zMYc!}814M|&Dc+5*aV{G!QbV;qT_s+hJ7_yuull%7zWQJsO%caENuw)=U#cEQT7}k zKoxZu%E#YB;XOJ;9#A{VncGrEN{EFCjiRP3! z!LHUeCqGWxs?14A8{fyl?9)|3axjp#X>Q?LjGodW?C!nMt7G(%)}G9^sz5XbCf|`A zuhi8}gW8#d7KoGX7v6De598HheB5T%=E8z47pg=TL?HUg@^vWO{gH(iPqSe8@UyV3 zS0+kNKoCnHgb#amh+5a$y+O|h&EI;J*K+jpm0sD|P z-l(F*FsqBhJ%{khu1Ud*N+8}fz$&Z!-O2hZ9je+BXIy(hz41c?SAwZ=2*+aC9aa?| zi>L_#gw^Hxnr03B)kLDF5x-wjrEeKg_Qz7w{^H_%!vh=Mc}Kz#4n#N*;Xs4~0Xgvh X1b<|z3{L=n00000NkvXXu0mjf4D51H diff --git a/app/src/main/res/layout/dialog_orderok.xml b/app/src/main/res/layout/dialog_orderok.xml new file mode 100644 index 0000000..2c53c67 --- /dev/null +++ b/app/src/main/res/layout/dialog_orderok.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file From e97d0074a277ba12846f021c158d1aef1bc8d9fe Mon Sep 17 00:00:00 2001 From: LeeSohee Date: Sun, 29 Sep 2019 23:24:44 +0900 Subject: [PATCH 14/17] =?UTF-8?q?=EB=B7=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeonha/Network/Get/GetClassListResponse.kt | 2 +- .../song2/jeonha/UI/Class/ClassListActivity.kt | 5 +---- .../adapter/ClassListRecyclerViewAdapter.kt | 2 +- .../com/song2/jeonha/UI/Main/MainActivity.kt | 14 ++++++++++++++ .../GetMyBookingList/ClassListItemData.kt | 2 +- app/src/main/res/drawable-hdpi/appicon_2.png | Bin 0 -> 2746 bytes app/src/main/res/drawable-mdpi/appicon_2.png | Bin 0 -> 1658 bytes app/src/main/res/drawable-xhdpi/appicon_2.png | Bin 0 -> 3852 bytes app/src/main/res/drawable-xxhdpi/appicon_2.png | Bin 0 -> 5893 bytes app/src/main/res/drawable-xxxhdpi/appicon_2.png | Bin 0 -> 8165 bytes .../main/res/drawable/white_gray_border_1dp.xml | 2 +- app/src/main/res/layout/activity_main.xml | 6 +++--- app/src/main/res/layout/dialog_hanok.xml | 1 - app/src/main/res/layout/rv_item_hanok_filter.xml | 1 + app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/styles.xml | 8 ++++++++ 17 files changed, 33 insertions(+), 13 deletions(-) rename app/src/main/java/com/song2/jeonha/{ => UI}/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt (69%) create mode 100644 app/src/main/res/drawable-hdpi/appicon_2.png create mode 100644 app/src/main/res/drawable-mdpi/appicon_2.png create mode 100644 app/src/main/res/drawable-xhdpi/appicon_2.png create mode 100644 app/src/main/res/drawable-xxhdpi/appicon_2.png create mode 100644 app/src/main/res/drawable-xxxhdpi/appicon_2.png diff --git a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt index 8239e96..616ff9f 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt @@ -1,6 +1,6 @@ package com.song2.jeonha.Network.Get -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData class GetClassListResponse( val success: Boolean, diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt index 6f0c59b..7872c87 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt @@ -6,17 +6,14 @@ import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.util.Log import android.view.Window -import android.widget.RadioButton -import android.widget.RelativeLayout import android.widget.TextView -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import com.song2.jeonha.Network.ApplicationController import com.song2.jeonha.Network.Get.GetClassListResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import com.song2.jeonha.UI.Class.adapter.ClassListRecyclerViewAdapter import kotlinx.android.synthetic.main.activity_class_list.* -import kotlinx.android.synthetic.main.dialog_select_class.* import retrofit2.Call import retrofit2.Response diff --git a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt index 66058be..61abf04 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt @@ -11,7 +11,7 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide -import com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData import com.song2.jeonha.UI.Class.ClassDetailActivity import com.song2.jeonha.R import org.jetbrains.anko.startActivity diff --git a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt index a561296..645e81e 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -29,6 +29,8 @@ import retrofit2.Response class MainActivity : AppCompatActivity() { + var flag_first=0 + val networkService: NetworkService by lazy { ApplicationController.instance.networkService } @@ -57,6 +59,7 @@ class MainActivity : AppCompatActivity() { setClassProgramRecyclerView(arrayListData) setTitleRecyclerView() + setOnBtnClickListener() switch_main_main_act_selector.setOnCheckedChangeListener { button, checked -> if (!checked) { //한옥통신 @@ -80,6 +83,17 @@ class MainActivity : AppCompatActivity() { } } + private fun setOnBtnClickListener() { + if(flag_first ==0){ + + iv_main_act_more_btn.setOnClickListener { + startActivity() + } + + flag_first =1 + } + } + fun setClassProgramRecyclerView(arrayListData: ArrayList) { Log.e("리사이클러뷰 Data", ":::confirm"+arrayListData.size) diff --git a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt similarity index 69% rename from app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt index ff01e10..265189b 100644 --- a/app/src/main/java/com/song2/jeonha/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment.GetMyBookingList +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList data class ClassListItemData( val classIdx: Int, diff --git a/app/src/main/res/drawable-hdpi/appicon_2.png b/app/src/main/res/drawable-hdpi/appicon_2.png new file mode 100644 index 0000000000000000000000000000000000000000..ccfd197d24f0a1284fc06c1c8e86efce4b7ba44c GIT binary patch literal 2746 zcmV;r3PtsaP)PxpW18t@h{9@m&ZT~b5J-vKe*vJUo|8=V>JAQL z!o(m2vM1FLs%67U2j?jmbYd(x)WGIxKt9A3oy-szz#hc2l}_>qjAaixPqKFM@@mgb zWq=+K3{^GHvGxh)F+fkOwNjPai?di&?xR(G(*aU}PX|Z`NCg2EvF<@SKq?5Rh;NdPWvpU7XOb_w#Uc)V_J43Q+2WOPDox z5wde`SNMK|`}V|&_vfKTjq;HkzF;}Nk4=zl+1c4*dBi*f_w6C^o>d{g;2}b%{S_B4 zU6oAogWD1HF}#{Ilz5g3<#(>2wQ6ltrNCixv2jOn=*UsY@^2R}8-c@ul9Ezv-MLrN zQ7ROy+l+gYXQ24_NkQe&p8dER`X-7Dz&34r@Nl9LI4r++{{i-XeZW*zv99Vtm#(BM zHr66YyK+rZ%et8(l?@9yx9%8L&B{eb60s*f2{CyE$PZhLBHF^LNm`yBu9&`I3;MP2 zhHcB{X6Z@&GW>_t{CnGa8QH$mp?R3F|=8zVaA-&nOS3YFQ}-5#?K*Y4+G z$7d_x*WMTTX;<(d>n2L?-b3M~E2x)|iCOdjU7Z}U^3%_8_WVWo`Lve3x5_eA0b;|o zYB@+3PC9W)_F9hh>S6%RT86~w!TPA}l>&$DtlhX31N-;F?L!IpWzmOdNbiB~+St(0 zvVluN66_L=;f$>7INuH zKYaK|tXAlJBIPuSii**gVo#%UskqmZ@|S6o;9jSWWar+EnP5Uh za~>j=eL_>|9oX8|z?4@;!cku(^X=g8hqWsf3T87EQVGLra$nR^ z3sGOw5aUdAVdO{n^_=wCjM!c{a~9mNfd@uRoDR-CPM$g=B#AR=NW3087C}9`BZG#+ zS!%x}dbd$qrOE|LDko1IiN*~*l~j!QK5bj!<-x%?5_b$iJ-QpoOe?YR$G}HGXMb#7 z8)_BA>AmnUcE`tkw=Zb?Zo8Z>ZMkSen|7J9h33Lq(K8A~`$S|W?muASP;w&iJb z()bYwpEFI8F9@Hl7)&`fRD?=OAERE~^69)HZR=9IQki9kl8xrxO_f9f-y%T12_Nk#g_er_><{o&9}ibIo{3BkFMC^eCVU9DU4_R!N5n zHEY^w0*BkE0>nx@70&&~QWVfaRU}@iuV1|wb_!l0>KUFrJ=_p6e-2i!+k)E!0LQYP z&j%oE&QwD+oTlp(`uSkuz`hcH;+POzzM77cKc2zp;eV3&riD$P?}RtSAj^@(w3Tw* zVhj?SeYj?$5jf0GKKT<4Q?gZ2;vpLQO*G;U#Nfn{eUt$>XbpdMyKoX(4J#OIEB$ zGw&t>n=|2%@l)|2k7AAi?f>o|?&RJz;8<7G1Q6e_9PvhYWr_Eg?Cj(nxET%MbE#=& zrpJyPiqElci#kYVIIi*XWzo_#lsc?~n``+u?uTg~=$&^zKoeTY4;kD~YV$K~bwts! zXyckliT5lDRsnSFdM5a=mi`-?i2X5}(3mm|{9wKS+Neoy z2|1DYR>Yk)?|Eo(ZnP-!V@#z@`&Whz#O&#zV)JKq*5pAoX`NL}i@@KLifILJO1#y} zoAvSZW|X%{cnas>&iN6~RE5;0M_^ZM-@IB_+?uv`u$NyS+AHu)+jCtLK%Ho*z;66| zQb3pT7-V{#pk9ICgJ-ELlne1{pI-{_j8?mLEmL)=-le1bTC!W$PLhsVLDPri9A_3T z`3PsurkZ8JY8OzGa{vyVFhW@Ts_9ln&J)QOJNDv6RyI87MdO&^L-5+T;hIfp0!Xv9 zDyaB}2-1IKTy=m{o{kQX4v-20Dq`J(bbwS4P!a1MqywaafQnf6ARQnT1XRSj2WbF^ ze-7%70*qkh(yO5IR^;-H9>apXg#tz%fW5VkA-_kdF8= zPPP2YeP_>MECdpUm{<|d6qACfJeH1X|1*LA2QQgbDM#71-T(jq07*qoM6N<$g2sMF Az5oCK literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/appicon_2.png b/app/src/main/res/drawable-mdpi/appicon_2.png new file mode 100644 index 0000000000000000000000000000000000000000..14a48870e4ad3c244bf6d3daf8efcafc0867c11b GIT binary patch literal 1658 zcmV-=28H>FP)Px*G)Y83RA>e5T6s)VM;QOHAiEs#z^klsC`zie-bX=1OT@I*R7`E_0hQ25KzpFA zwl(qWAxAw}(NYwOP*FrM7^^lxqP?(`R*a=6MG>_EilDNva!KbK-RIlKdw~A{oA4!* z_nkA}H}lOm^IjhC1X@~JELdC4+Bw#0SnF;;K9O(aqlM9L{$vbC)=sl#E}oItaE@`NiMeKk|4sqaFo*5U$Z4^wdJ3RL%rQ4y zWo`~j{p|@rIwPG;_pCr?&$x8Fo)wVJNN3Y#zXDcrGgf`?J|cI@j%1$1p1t3rv9S?L-kOilcb6)v z%bvu#*!@UIKCEaY7R2ek!qiFQuy21VV&akn(Xu6PVAaYXf#%4=htNmuLcWCx6@B_( zQgJb~^In0q?<^BNPv3>8t1}3^oUC-%*k}Y=jL5FQqeqX#I&I?3&5w0!>*`GO49r<6 z9NG|p=)8Q4)TrU6QX#sb5e}DjBhl3feMh

SE`KNqs$20RC_L;o9|^xK&mGy}k~& z$}5De81 z?GZ6p`2IR%ol2E6YnLax0t5Q@!_M&a+&CdQ4Z7Gwp(F3WZD;BqHp|ep2j2M$m2*%0By>iP@OZ?gHJ^ z)WlaxU??Evw<|$c-qQ3;IK1hH@dx)|!jVL{$3&umrH6~57H59WQLt{C-DUu3M^E5y zR#n8{F?AwRGk!q!PdTu%vI5cVL2lj!rec8wdv$R4nE?wbVGL~h^oIBPHSi982UNwB zpr)o)Nd(yxs&8oEWi0v7Q4>Q-pNj>Tv31)X&iC?|jFrm+Sef%jN?In4vpkoBOGQ@@ zx#bh|>LoiIsNab!mGt^r*xTE+>SF%lVEE1T#in&(tz@z*@ZLuo`NkAiBRe}=e8_S% z=}?By$uBv1SQhdzhG++4-~b1KFGWg9uVdQe@lv)4?d35A<##Ggcw!>!%&%fnz-0p{ zDlQQe2(h;A#W%IvFc;X{+M38LRhCd&TbuBtL`UBFhOtswU3Fh-D$rE*gA~Nv|0-Yy;oCc0;fcBO0}G zipr)C8E=lzp``Q%D(_a|Fe{sR=P!!;Y=zUs?fBt+ICnaOKZmoNHbPR`F@ADW9#f-( zlAd2g#h{5DXoTnfc>#rNb)FRz19+pZab!Ji)nuxNq&6bktUtobT9@7 zF5>SI6l7V&ZDbt#5toauV(aF$u(P${ol3{fK7N1~54jN)SHMQ2;n!F>qmJ+l2Gi@b zkGBU)k>_zBH4{k(Ghi^(L+dz*pTcySi-E4rMtiz;kS|K07(j5)VtgB)f`|3>O16r8 z8j#KhDfD;fC%nN)WnwyPMG#NdX7*k}si^cWKsJggB<`>~*6tcRzN%(U4hdIwEwoz6`pl$Og#lq&@tU^sZ~G$#CJ>AI_6Y7T_xxvjoJQc zpklW@`e^3Qn*2wdj?F}8Ymu-1PketoHmw9}X7{_z|F${y(F!Gk!vFvP07*qoM6N<$ Ef=0wCi~s-t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/appicon_2.png b/app/src/main/res/drawable-xhdpi/appicon_2.png new file mode 100644 index 0000000000000000000000000000000000000000..fcfcfbc659f1c6a9b0a8bf8014990e2cbb467e7f GIT binary patch literal 3852 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/appicon_2.png b/app/src/main/res/drawable-xxhdpi/appicon_2.png new file mode 100644 index 0000000000000000000000000000000000000000..3e3953472026e9a456b5f5c2d3787b4a1d131d05 GIT binary patch literal 5893 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/appicon_2.png b/app/src/main/res/drawable-xxxhdpi/appicon_2.png new file mode 100644 index 0000000000000000000000000000000000000000..eb3da5ddf4124f5f72026e395d3b482498233577 GIT binary patch literal 8165 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 tfo#Gg - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5d92b1c..ff17706 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -51,7 +51,7 @@ @@ -61,8 +61,8 @@ android:orientation="horizontal"> #ffffff #000000 #f4f2f2 + #e6e2e2 #de000000 #ced4da diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cbd9e37..8f20848 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - JeonHa + 전하 한옥 스테이 아이디/비밀번호를 잊으셨나요? diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5f8e2cb..0683c1b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -18,39 +18,47 @@ From 95dd2b2e1767e9d83cf91518359aa72203101271 Mon Sep 17 00:00:00 2001 From: LeeSohee Date: Sun, 29 Sep 2019 23:25:01 +0900 Subject: [PATCH 15/17] =?UTF-8?q?=20=ED=86=B5?= =?UTF-8?q?=EC=8B=A0=20=EB=B7=B0=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeonha/UI/Hanok/HanokDetailActivity.kt | 28 +- .../jeonha/UI/Hanok/data/HanokDetailItem.kt | 3 +- .../main/res/layout/activity_hanok_detail.xml | 413 ++++++++++-------- 3 files changed, 251 insertions(+), 193 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt index 7d35a54..ad331a3 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt @@ -4,6 +4,7 @@ import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.support.v7.widget.LinearLayoutManager import android.util.Log +import android.view.View import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.OnMapReadyCallback @@ -41,16 +42,11 @@ class HanokDetailActivity : AppCompatActivity(), OnMapReadyCallback { hanokIdx = intent.getIntExtra("idx", -1) getMap() - setRecyclerView() } - private fun setRecyclerView() { + private fun setRecyclerView(items: HanokDetailItem) { //추천 리싸이클러뷰 - var roomsList: ArrayList = ArrayList() - roomsList.add(Rooms("싱클룸", 1, 2)) - roomsList.add(Rooms("트리플", 1, 2)) - roomsList.add(Rooms("기타", 1, 2)) - + var roomsList: ArrayList = items.rooms var hanOkRecyclcerViewAdapter = HanOkRecyclcerViewAdapter(this, roomsList) @@ -76,6 +72,7 @@ class HanokDetailActivity : AppCompatActivity(), OnMapReadyCallback { Log.d(TAG, items.toString()) setContent(items) + setRecyclerView(items) } } } @@ -85,6 +82,23 @@ class HanokDetailActivity : AppCompatActivity(), OnMapReadyCallback { private fun setContent(items: HanokDetailItem) { val location = LatLng(items.latitude, items.longitude) if (mMap != null) addMarker(mMap, location) + + tv_ac_hanok_detail_name.text = items.name + tv_ac_hanok_detail_.text = items.type + tv_ac_hanok_detail_address.text = items.address + tv_ac_hanok_detail_address_map.text = items.address + tv_ac_hanok_detail_place.text = items.place + tv_ac_hanok_detail_detail.text = items.detail + tv_ac_hanok_detail_address_trans.text = items.transport + + if (items.option != null && items.option != "") { + view_option.visibility = View.VISIBLE + ll_option.visibility = View.VISIBLE + tv_ac_hanok_detail_option.text = items.option + } else { + view_option.visibility = View.GONE + ll_option.visibility = View.GONE + } } private fun getMap() { diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt index 7ea32c0..0b03fb2 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt @@ -11,5 +11,6 @@ data class HanokDetailItem( val detail: String, val option: String, val transport: String, - val img: ArrayList + val img: ArrayList, + val rooms : ArrayList ) \ No newline at end of file diff --git a/app/src/main/res/layout/activity_hanok_detail.xml b/app/src/main/res/layout/activity_hanok_detail.xml index 00eaf85..da653b1 100644 --- a/app/src/main/res/layout/activity_hanok_detail.xml +++ b/app/src/main/res/layout/activity_hanok_detail.xml @@ -1,6 +1,5 @@ - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> - + + - + + + - + android:text="한옥체험업" + android:textColor="#2e394a" + android:textSize="12sp" /> + + android:background="#ced4da" /> + android:text="청계천 · 종로" + android:textSize="12sp" /> @@ -84,254 +84,297 @@ android:id="@+id/tv_ac_hanok_detail_name" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="20sp" - android:textColor="#2e394a" - android:fontFamily="@font/noto_sans_cjkkr_medium" android:layout_marginTop="5dp" - android:text="누리한옥게스트하우스"/> + android:fontFamily="@font/noto_sans_cjkkr_medium" + android:text="누리한옥게스트하우스" + android:textColor="#2e394a" + android:textSize="20sp" /> + android:text="서울시 종로구 체부동 147-1" + android:textColor="#868e96" + android:textSize="14sp" /> - - - - + + android:layout_height="wrap_content" + android:layout_marginHorizontal="16dp" + android:layout_marginTop="16dp" + android:orientation="vertical"> - + android:layout_height="wrap_content"> + + + + + + + + + android:layout_marginTop="14dp" + android:fontFamily="@font/noto_sans_cjkkr_regular" + android:text="2016년 신축된 전통한옥으로, 한국의 전통이 살아있는 경복궁 인근 서울 종로 서촌에 위치해 있습니다. 4채의 독립된 건물인 한옥이 한대 모여있어, 개인 및 단체(가족/워크샵 등)로 오시는 분들에게도 안성맞춤입니다. 한옥체험업으로 정식 인가가되어 있고, 한국관광공사 통합품질인증 프리미어 등급의 인증을 받은 믿고 숙박 하실 수 있는 한옥입니다. 다양한 연령대의 손님들과, 여러 국적에서도 한국의 전통 가옥인 한옥에 찾아주십니다. +" + android:textColor="#495057" + android:textSize="16sp" /> - + + + + android:orientation="vertical" + android:padding="16dp"> + + + - + - + + - + + + android:layout_marginTop="16dp" + android:orientation="vertical"> - - - - - + android:layout_marginLeft="16dp" + android:layout_marginBottom="10dp"> + - + - + - + + - + + android:layout_marginHorizontal="16dp" + android:layout_marginTop="16dp" + android:orientation="vertical"> - + android:orientation="horizontal"> + + + + + + - - + android:layout_marginTop="4dp" + android:text="서울시 종로구 체부동 147-1" + android:textColor="#868e96" + android:textSize="16sp" /> - - - + - + - - - ++ 김포공항 서울역 AREX -경복궁역" + android:textColor="#868e96" + android:textSize="16sp" /> + - + + - - - - - + android:layout_height="match_parent" + android:layout_marginHorizontal="16dp" + android:layout_marginVertical="8dp" + android:src="@drawable/red_round_fill" /> - - + - - - - \ No newline at end of file From 4a4b641b2842b19fb57a39b8d2c076ea5686b8bc Mon Sep 17 00:00:00 2001 From: choidaye Date: Mon, 30 Sep 2019 01:14:42 +0900 Subject: [PATCH 16/17] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=ED=81=B4=EB=9E=98=EC=8A=A4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=95=9C=EC=98=A5=20=EB=8B=A4=EC=9D=B4?= =?UTF-8?q?=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EB=9D=84=EC=9A=B0=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jeonha/Network/Post/PostUserSignUp.kt | 2 +- .../Post/Response/PostUserSignUpResponse.kt | 2 +- .../jeonha/UI/Hanok/HanokDetailActivity.kt | 40 +++++++++++++++++++ .../song2/jeonha/UI/Login/SignUpActivity.kt | 18 ++++----- .../main/res/layout/activity_hanok_detail.xml | 2 +- app/src/main/res/layout/dialog_orderok.xml | 3 +- 6 files changed, 54 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/Network/Post/PostUserSignUp.kt b/app/src/main/java/com/song2/jeonha/Network/Post/PostUserSignUp.kt index 96a0f5b..f8a6fff 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Post/PostUserSignUp.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Post/PostUserSignUp.kt @@ -2,7 +2,7 @@ package com.song2.jeonha.Network.Post data class PostUserSignUp( val id : String, - val password : String, + val pw : String, val name : String, val phone : String diff --git a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt index 711d871..9048dc7 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt @@ -5,7 +5,7 @@ import com.song2.jeonha.UI.Hanok.data.Authorization data class PostUserSignUpResponse( val success : Boolean, val status : Int, - val resMessage : String, + val message : String, val data: Authorization ) diff --git a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt index ad331a3..eeb3e25 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt @@ -1,5 +1,6 @@ package com.song2.jeonha.UI.Hanok +import android.app.Dialog import android.support.v7.app.AppCompatActivity import android.os.Bundle import android.support.v7.widget.LinearLayoutManager @@ -19,6 +20,8 @@ import com.song2.jeonha.Network.Get.GetHanokDetailResponse import com.song2.jeonha.Network.NetworkService import com.song2.jeonha.R import kotlinx.android.synthetic.main.activity_hanok_detail.* +import kotlinx.android.synthetic.main.dialog_hanok.* +import kotlinx.android.synthetic.main.dialog_orderok.* import retrofit2.Call import retrofit2.Callback import retrofit2.Response @@ -42,6 +45,43 @@ class HanokDetailActivity : AppCompatActivity(), OnMapReadyCallback { hanokIdx = intent.getIntExtra("idx", -1) getMap() + + + setTextChangedListener() + } + + private fun setTextChangedListener() { + + btn_ac_hanok_detail_order.setOnClickListener { + + + showDialog() + + } + } + + + + private fun showDialog() { + val dialog = Dialog(this) + dialog.setContentView(R.layout.dialog_orderok) + dialog.show() + + setDialogClickListener(dialog) + } + + + + private fun setDialogClickListener(dialog: Dialog) { + + + + dialog.btn_dialog_order_ok.setOnClickListener { + + + dialog.dismiss() + + } } private fun setRecyclerView(items: HanokDetailItem) { diff --git a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt index d42ac15..f1d44cd 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt @@ -45,14 +45,14 @@ class SignUpActivity : AppCompatActivity() { //값들이 채워졌을 때 setTextChangedListener() - //될까? - if(cnt == 5) - { - //버튼 활성화 & 통신 - btn_ac_signup_ok.setBackgroundColor(Color.parseColor("#f3505a")) - - - } +// //될까? +// if(cnt == 5) +// { +// //버튼 활성화 & 통신 +// btn_ac_signup_ok.setBackgroundColor(Color.parseColor("#f3505a")) +// +// +// } } @@ -264,7 +264,7 @@ class SignUpActivity : AppCompatActivity() { } else { - var message: String = response.body()!!.resMessage + var message: String = response.body()!!.message Log.e("signup error","회원가입 에러"+message) diff --git a/app/src/main/res/layout/activity_hanok_detail.xml b/app/src/main/res/layout/activity_hanok_detail.xml index da653b1..1208d34 100644 --- a/app/src/main/res/layout/activity_hanok_detail.xml +++ b/app/src/main/res/layout/activity_hanok_detail.xml @@ -355,7 +355,7 @@ Date: Mon, 30 Sep 2019 02:03:13 +0900 Subject: [PATCH 17/17] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=ED=86=B5=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Post/Response/PostUserSignUpResponse.kt | 1 + .../song2/jeonha/UI/Login/SignUpActivity.kt | 34 ++++++++----------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt index 9048dc7..15e51c3 100644 --- a/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt +++ b/app/src/main/java/com/song2/jeonha/Network/Post/Response/PostUserSignUpResponse.kt @@ -6,6 +6,7 @@ data class PostUserSignUpResponse( val success : Boolean, val status : Int, val message : String, + val resMessage : String, val data: Authorization ) diff --git a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt index f1d44cd..6425ecc 100644 --- a/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt @@ -45,21 +45,15 @@ class SignUpActivity : AppCompatActivity() { //값들이 채워졌을 때 setTextChangedListener() -// //될까? -// if(cnt == 5) -// { -// //버튼 활성화 & 통신 -// btn_ac_signup_ok.setBackgroundColor(Color.parseColor("#f3505a")) -// -// -// } } private fun setOnClickListener() { btn_ac_signup_ok.setOnClickListener { - PostUserSignUpResponse() + GetUserIdCheck() + + } @@ -197,6 +191,7 @@ class SignUpActivity : AppCompatActivity() { btn_ac_signup_checkid.setVisibility(View.GONE) iv_ac_signup_id_check.setVisibility(View.VISIBLE) cnt++ + PostUserSignUpResponse() } @@ -227,7 +222,7 @@ class SignUpActivity : AppCompatActivity() { if (et_ac_sign_up_id.text.toString().isNotEmpty() && et_ac_sign_up_pw.text.toString().isNotEmpty() - && et_ac_sign_up_pw_check.text.toString().isNotEmpty() && et_ac_sign_up_name.text.isNotEmpty() && et_ac_sign_up_phone.text.isNotEmpty() + && et_ac_sign_up_name.text.isNotEmpty() && et_ac_sign_up_phone.text.isNotEmpty() ) { val input_id: String = et_ac_sign_up_id.text.toString() @@ -237,11 +232,9 @@ class SignUpActivity : AppCompatActivity() { - - //통신 시작 val postSignUpResponse: Call = - networkService.postUserSignUp(PostUserSignUp(input_id, input_pw,input_name,input_phone)) + networkService.postUserSignUp(PostUserSignUp(input_id, input_pw, input_name, input_phone)) postSignUpResponse.enqueue(object : Callback { override fun onFailure(call: Call, t: Throwable) { Log.e("Sign Up Fail", t.toString()) @@ -251,32 +244,35 @@ class SignUpActivity : AppCompatActivity() { // 세모입 다예 화이팅 !! ❤️ + + //통신 성공 시 수행되는 메소드 override fun onResponse( call: Call, response: Response ) { - if (response.body()!!.status==200) { + if (response.isSuccessful) { + + + + var resMessage: String = response.body()!!.resMessage + Log.v("signup Successful","회원가입 성공"+resMessage) startActivity() finish() } else { - var message: String = response.body()!!.message Log.e("signup error","회원가입 에러"+message) - - } } }) } else{ - toast("빈칸을 다 채워주세요 :)") + toast("빈칸을 다 채워주세요") } } - }