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/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt deleted file mode 100644 index 89f548d..0000000 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListActivity.kt +++ /dev/null @@ -1,87 +0,0 @@ -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.R -import kotlinx.android.synthetic.main.activity_class_list.* -import kotlinx.android.synthetic.main.activity_main.* -import org.jetbrains.anko.ctx - -class ClassListActivity : AppCompatActivity() { - - - lateinit var classListRecyclerViewAdapter: ClassListRecyclerViewAdapter - var arrayListData : ArrayList = ArrayList() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_class_list) - - setClassRecyclerView() - - iv_class_list_act_filter_btn.setOnClickListener { - clickFilterBtn() - } - } - - fun clickFilterBtn(){ - - val dlg = Dialog(this) - - dlg.requestWindowFeature(Window.FEATURE_NO_TITLE) - dlg.setContentView(R.layout.dialog_select_class) - dlg.show() - - 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){ - - } - } - - - dialogQuit.setOnClickListener { - dlg.dismiss() - } - dialogSubmit.setOnClickListener { - dlg.dismiss() - } - } - - fun setClassRecyclerView(){ - - var day : ArrayList = ArrayList() - - day.add("월요일") - 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)) - - classListRecyclerViewAdapter = ClassListRecyclerViewAdapter(this, arrayListData) - rv_class_list_act_list.adapter = classListRecyclerViewAdapter - rv_class_list_act_list.layoutManager = LinearLayoutManager(this) - - } -} diff --git a/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt b/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt deleted file mode 100644 index 666ea47..0000000 --- a/app/src/main/java/com/song2/jeonha/Hanok/HanokDetailActivity.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.song2.jeonha.Hanok - -import android.support.v7.app.AppCompatActivity -import android.os.Bundle -import android.support.v7.widget.LinearLayoutManager -import com.song2.jeonha.Hanok.data.Rooms -import com.song2.jeonha.R -import kotlinx.android.synthetic.main.activity_hanok_detail.* - -class HanokDetailActivity : AppCompatActivity() { - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_hanok_detail) - - - - //추천 리사이클러뷰 - var roomsList : ArrayList = ArrayList() - roomsList.add(Rooms("싱클룸", 1, 2)) - roomsList.add(Rooms("트리플", 1, 2)) - roomsList.add(Rooms("기타", 1, 2)) - - - var hanOkRecyclcerViewAdapter = - HanOkRecyclcerViewAdapter(this, roomsList) - rv_ac_hanok_detail_room.adapter = hanOkRecyclcerViewAdapter - rv_ac_hanok_detail_room.layoutManager = LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false) - - - - } - - - - - - - -} diff --git a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt b/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt deleted file mode 100644 index 97af1a7..0000000 --- a/app/src/main/java/com/song2/jeonha/Login/LoginActivity.kt +++ /dev/null @@ -1,93 +0,0 @@ -package com.song2.jeonha.Login - -import android.support.v7.app.AppCompatActivity -import android.os.Bundle -import android.util.Log -import android.widget.Toast -import com.song2.jeonha.Main.MainActivity -import com.song2.jeonha.Network.ApplicationController -import com.song2.jeonha.Network.NetworkService -import com.song2.jeonha.Network.Post.PostUserLogin -import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse -import com.song2.jeonha.R -import kotlinx.android.synthetic.main.activity_login.* -import org.jetbrains.anko.startActivity -import org.jetbrains.anko.toast -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class LoginActivity : AppCompatActivity() { - - val networkService: NetworkService by lazy { - ApplicationController.instance.networkService - } - - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_login) - - - setOnClickListener() - - - } - - private fun setOnClickListener() { - - btn_ac_login_signin.setOnClickListener { - PostLoginResponse() - } - - btn_ac_login_signup.setOnClickListener { - startActivity() - } - - - } - - - - - private fun PostLoginResponse() { - - - if (et_ac_login_id.text.toString().isNotEmpty() && et_ac_login_pw.text.toString().isNotEmpty()) { - - val input_login_id: String = et_ac_login_id.text.toString() - val input_login_pw: String = et_ac_login_pw.text.toString() - - - - val postLoginResponse: Call = networkService.postUserLogin(PostUserLogin(input_login_id, input_login_pw)) - postLoginResponse.enqueue(object : Callback { - 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) - - } - } - }) - } - - else { - toast("빈칸을 다 채워주세요") - } - } -} diff --git a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt b/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt deleted file mode 100644 index 85fc196..0000000 --- a/app/src/main/java/com/song2/jeonha/Login/SignUpActivity.kt +++ /dev/null @@ -1,101 +0,0 @@ -package com.song2.jeonha.Login - -import android.os.Bundle -import android.support.v7.app.AppCompatActivity -import android.util.Log -import com.song2.jeonha.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 -import retrofit2.Call -import retrofit2.Callback -import retrofit2.Response - -class SignUpActivity : AppCompatActivity() { - - - val networkService: NetworkService by lazy { - ApplicationController.instance.networkService - } - - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_sign_up) - - - setOnClickListener() - } - - private fun setOnClickListener() { - btn_ac_signup_ok.setOnClickListener { - - PostUserSignUpResponse() - - } - - - - } - - - - private fun PostUserSignUpResponse() { - - //edittext에 있는 값 받기 - - - 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() - ) { - - val input_id: String = et_ac_sign_up_id.text.toString() - val input_pw: String = et_ac_sign_up_pw.text.toString() - val input_name: String = et_ac_sign_up_name.text.toString() - val input_phone: String = et_ac_sign_up_phone.text.toString() - - - - //통신 시작 - val postSignUpResponse: Call = - 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()) - - } - - - // 세모입 다예 화이팅 !! ❤️ - - //통신 성공 시 수행되는 메소드 - override fun onResponse( - call: Call, - response: Response - ) { - if (response.isSuccessful) { - - - - startActivity() - } else { - var message: String = response.body()!!.resMessage - Log.e("signup error","회원가입 에러"+message) - } - } - }) - } - else{ - toast("빈칸을 다 채워주세요 :)") - } - - } - - -} diff --git a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt b/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt deleted file mode 100644 index 0c46fd0..0000000 --- a/app/src/main/java/com/song2/jeonha/Main/MainActivity.kt +++ /dev/null @@ -1,149 +0,0 @@ -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 -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.google.zxing.integration.android.IntentResult -import com.song2.jeonha.Main.Mypage.MypageActivity -import com.song2.jeonha.Main.QRcode.QRcodeActivity -import com.song2.jeonha.R -import kotlinx.android.synthetic.main.activity_main.* - -import org.jetbrains.anko.startActivity - -class MainActivity : AppCompatActivity() { - - lateinit var programListRecyclerViewAdapter: ProgramListRecyclerViewAdapter - var arrayListData : ArrayList = ArrayList() - - lateinit var titleListRecyclerViewAdapter: TitleListRecyclerViewAdapter - var titleListData : ArrayList = ArrayList() - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_main) - - iv_main_mypage.setOnClickListener { - startActivity() - } - - iv_main_QRtest.setOnClickListener { - onQrcodeScanner() - } - - iv_main_act_more_btn.setOnClickListener { - startActivity() - } - - setTitleRecyclerView() - stayRequest() - - switch_main_main_act_selector.setOnCheckedChangeListener { button, checked -> - if(!checked){ - //한옥통신 - Log.e("한옥통신", "In "+switch_main_main_act_selector.isChecked) - //switch_main_main_act_selector.toggle() - - stayRequest() - - iv_main_act_more_btn.setOnClickListener { - //startActivity() - } - - }else{ - //클래스통신 - Log.e("클래스통신", "In "+switch_main_main_act_selector.isSelected()) - //switch_main_main_act_selector.toggle() - - classRequest() - - 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(){ - - programListRecyclerViewAdapter = ProgramListRecyclerViewAdapter(this, arrayListData) - programListRecyclerViewAdapter.notifyDataSetChanged() - rv_main_act_class_list.adapter = programListRecyclerViewAdapter - 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","부채춤")) - - arrayListData.clear() - titleListRecyclerViewAdapter = TitleListRecyclerViewAdapter(this, titleListData) - rv_main_act_title_list.adapter = titleListRecyclerViewAdapter - rv_main_act_title_list.layoutManager = LinearLayoutManager(this) - } - - private fun onQrcodeScanner() { - - - val integrator = IntentIntegrator(this) - integrator.setBeepEnabled(false) - integrator.captureActivity = QRcodeActivity::class.java - integrator.initiateScan() - - } - - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (resultCode == Activity.RESULT_OK) { - val scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) - val re = scanResult.contents - Toast.makeText(this, "$re", Toast.LENGTH_LONG).show() - } else { - super.onActivityResult(requestCode, resultCode, data) - } - } - -} 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..786ae26 --- /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.UI.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/GetClassListResponse.kt b/app/src/main/java/com/song2/jeonha/Network/Get/GetClassListResponse.kt new file mode 100644 index 0000000..616ff9f --- /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.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData + +class GetClassListResponse( + val success: Boolean, + val status: Int, + val resMessage: String, + val data: ArrayList +) \ No newline at end of file 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..ab5a2b4 --- /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.UI.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/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 new file mode 100644 index 0000000..b04a8e6 --- /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.UI.Main.data.MainPrograms + +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/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/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..3e04b38 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,16 @@ 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.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.* @@ -40,6 +39,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( @@ -72,5 +83,26 @@ interface NetworkService { @Body authorization: PostUserSignUp ): Call + @GET("/user/check") + fun getUserIdCheck( + @Query("id") id : String + ) : Call + + //메인 조회 + @GET("/main") + fun getMainResponse( + @Header("authorization") token: String + ): Call + + @GET("/class") + fun getClassListResponse( + @Query ("day") day : Int + ): Call + + //클래스 디테일 + @GET("/class/{classIdx}") + fun getClassDetailResponse( + @Path("classIdx") classIdx: Int + ): Call } 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/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..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 @@ -1,10 +1,11 @@ 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, val status : Int, + val message : String, val resMessage : String, val data: Authorization 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 new file mode 100644 index 0000000..663dc3f --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassDetailActivity.kt @@ -0,0 +1,81 @@ +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.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 +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(classIdx!!) + + //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/UI/Class/ClassListActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt new file mode 100644 index 0000000..adbf409 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/ClassListActivity.kt @@ -0,0 +1,137 @@ +package com.song2.jeonha.UI.Class + +import android.app.Dialog +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +import android.support.v7.widget.LinearLayoutManager +import android.util.Log +import android.view.Window +import android.widget.TextView +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 retrofit2.Call +import retrofit2.Response + +class ClassListActivity : AppCompatActivity() { + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + lateinit var classListRecyclerViewAdapter: ClassListRecyclerViewAdapter + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_class_list) + + getClassListResponse(0) + + iv_class_list_act_filter_btn.setOnClickListener { + clickFilterBtn() + } + } + + fun clickFilterBtn(){ + + val dlg = Dialog(this) + + dlg.requestWindowFeature(Window.FEATURE_NO_TITLE) + dlg.setContentView(R.layout.dialog_select_class) + dlg.show() + + 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 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() + } + dialogSubmit.setOnClickListener { + dlg.dismiss() + } + } + + + fun setClassRecyclerView(data: ArrayList){ + + Log.e("getProgramsKeywordResponse", data.size.toString()) + + 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/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt new file mode 100644 index 0000000..f24ac3a --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassBookDateRecyclerViewAdapter.kt @@ -0,0 +1,37 @@ +package com.song2.jeonha.UI.Class.adapter + +import android.content.Context +import android.support.v7.widget.RecyclerView +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.TextView +import com.song2.jeonha.UI.Class.data.ScheduleData +import com.song2.jeonha.R + + +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/UI/Class/adapter/ClassListRecyclerViewAdapter.kt similarity index 67% rename from app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt index f2145a2..9295924 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/adapter/ClassListRecyclerViewAdapter.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class +package com.song2.jeonha.UI.Class.adapter import android.content.Context import android.graphics.Color @@ -11,13 +11,13 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView import com.bumptech.glide.Glide +import com.song2.jeonha.UI.Class.ClassDetailActivity import com.song2.jeonha.R -import de.hdodenhof.circleimageview.CircleImageView +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassListItemData +import org.jetbrains.anko.startActivity -class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { - - var CLASSIDX = "classIDX" +class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList) : RecyclerView.Adapter() { override fun onCreateViewHolder(viewgroup: ViewGroup, position: Int): Holder { @@ -32,28 +32,29 @@ class ClassListRecyclerViewAdapter(var ctx: Context, var dataList: ArrayList() + ctx.startActivity("idx" to dataList[position].classIdx) } +/* 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 + holder.classDay.text = dataList[position].weekday Glide.with(ctx) - .load(dataList[position].class_img) + .load(dataList[position].img) .into(holder.classImg) - holder.classImg.setColorFilter(Color.parseColor("#BDBDBD"), PorterDuff.Mode.MULTIPLY); + holder.classImg.setColorFilter(Color.parseColor("#BDBDBD"), PorterDuff.Mode.MULTIPLY) } diff --git a/app/src/main/java/com/song2/jeonha/Class/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt similarity index 77% rename from app/src/main/java/com/song2/jeonha/Class/ClassData.kt rename to app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt index fc7b019..32417bb 100644 --- a/app/src/main/java/com/song2/jeonha/Class/ClassData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Class +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 new file mode 100644 index 0000000..873a6b7 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ClassDetailedData.kt @@ -0,0 +1,11 @@ +package com.song2.jeonha.UI.Class.data + +data class ClassDetailedData( + val classIdx: Int, + val name: String, + val address: String, + val detail: String, + val transport: String, + val img: ArrayList, + val schedule: ArrayList +) \ No newline at end of file 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 new file mode 100644 index 0000000..9d0e0bf --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ImgData.kt @@ -0,0 +1,7 @@ +package com.song2.jeonha.UI.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/UI/Class/data/ScheduleData.kt b/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt new file mode 100644 index 0000000..2851804 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Class/data/ScheduleData.kt @@ -0,0 +1,8 @@ +package com.song2.jeonha.UI.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/Hanok/HanOkRecyclcerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkRecyclcerViewAdapter.kt similarity index 94% 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 index b6efa78..0ac8afa 100644 --- a/app/src/main/java/com/song2/jeonha/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/Hanok/HanOkSliderFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanOkSliderFragment.kt similarity index 94% 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 index 323e84c..d0f99aa 100644 --- a/app/src/main/java/com/song2/jeonha/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 new file mode 100644 index 0000000..eeb3e25 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokDetailActivity.kt @@ -0,0 +1,172 @@ +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 +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 +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.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 +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 + +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() + + + 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) { + //추천 리싸이클러뷰 + var roomsList: ArrayList = items.rooms + + var hanOkRecyclcerViewAdapter = + HanOkRecyclcerViewAdapter(this, roomsList) + rv_ac_hanok_detail_room.adapter = hanOkRecyclcerViewAdapter + 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) + setRecyclerView(items) + } + } + } + }) + } + + 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() { + 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/HanokFilterActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/HanokFilterActivity.kt similarity index 96% 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 index 56f89cb..de7e432 100644 --- a/app/src/main/java/com/song2/jeonha/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/Hanok/adapter/HanokListAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/adapter/HanokListAdapter.kt similarity index 93% 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 index 22917ed..2f88c32 100644 --- 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 @@ -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/Hanok/data/Authorization.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/Authorization.kt similarity index 61% 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 index e5f110f..1b9e7e3 100644 --- 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 @@ -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 new file mode 100644 index 0000000..0b03fb2 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/HanokDetailItem.kt @@ -0,0 +1,16 @@ +package com.song2.jeonha.UI.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, + val rooms : ArrayList +) \ No newline at end of file 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 80% 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 index 01a0f03..56c223e 100644 --- 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 @@ -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 new file mode 100644 index 0000000..f493f66 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Hanok/data/PhotoItem.kt @@ -0,0 +1,5 @@ +package com.song2.jeonha.UI.Hanok.data + +data class PhotoItem( + val img : String +) \ No newline at end of file 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 71% 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 index 2f42cf5..24fe8de 100644 --- 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 @@ -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/Hanok/dialog/HanokDialog.kt b/app/src/main/java/com/song2/jeonha/UI/Hanok/dialog/HanokDialog.kt similarity index 93% 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 index 1219e4a..5e20fc7 100644 --- 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 @@ -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 new file mode 100644 index 0000000..ccd2fcc --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Login/LoginActivity.kt @@ -0,0 +1,155 @@ +package com.song2.jeonha.UI.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 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 +import com.song2.jeonha.Network.Post.Response.PostUserLoginResponse +import com.song2.jeonha.R +import kotlinx.android.synthetic.main.activity_login.* +import org.jetbrains.anko.startActivity +import org.jetbrains.anko.toast +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class LoginActivity : AppCompatActivity() { + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_login) + + + setOnClickListener() + setTextChangedListenerID() + 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_pw.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + + } + + private fun setTextChangedListenerID() { + 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_id.setBackgroundColor(Color.parseColor("#f3505a")) + } else { + v_login_id.setBackgroundColor(Color.parseColor("#2e394a")) + } + } + }) + } + + private fun setOnClickListener() { + + btn_ac_login_signin.setOnClickListener { + PostLoginResponse() + } + + btn_ac_login_signup.setOnClickListener { + startActivity() + } + + + } + + + + + private fun PostLoginResponse() { + + + if (et_ac_login_id.text.toString().isNotEmpty() && et_ac_login_pw.text.toString().isNotEmpty()) { + + val input_login_id: String = et_ac_login_id.text.toString() + 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 { + override fun onFailure(call: Call, t: Throwable) { + Log.e("Sign In Fail", t.toString()) + + + } + + //통신 성공 시 수행되는 메소드 + override fun onResponse(call: Call, response: Response) { + + 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") + } + }) + } + + else { + toast("빈칸을 다 채워주세요") + } + } +} 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 new file mode 100644 index 0000000..6425ecc --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Login/SignUpActivity.kt @@ -0,0 +1,278 @@ +package com.song2.jeonha.UI.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.UI.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 +import com.song2.jeonha.R +import kotlinx.android.synthetic.main.activity_sign_up.* +import org.jetbrains.anko.startActivity +import org.jetbrains.anko.toast +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response + +class SignUpActivity : AppCompatActivity() { + + + var cnt = 0 + + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_sign_up) + + + setOnClickListener() + + et_ac_sign_up_phone.addTextChangedListener(PhoneNumberFormattingTextWatcher()) + + //값들이 채워졌을 때 + setTextChangedListener() + + + } + + private fun setOnClickListener() { + btn_ac_signup_ok.setOnClickListener { + + GetUserIdCheck() + + + } + + + 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")) + iv_ac_signup_name_check.setVisibility(View.VISIBLE) + 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!!.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++ + } + } + }) + + 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++ + PostUserSignUpResponse() + + + } + else { + toast(response.body()!!.message) + + } + + + } + + else + { + + } + + } + }) + + + + } + } + + private fun PostUserSignUpResponse() { + + //edittext에 있는 값 받기 + + + if (et_ac_sign_up_id.text.toString().isNotEmpty() && et_ac_sign_up_pw.text.toString().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() + val input_pw: String = et_ac_sign_up_pw.text.toString() + val input_name: String = et_ac_sign_up_name.text.toString() + val input_phone: String = et_ac_sign_up_phone.text.toString() + + + + //통신 시작 + val postSignUpResponse: Call = + 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()) + + } + + + // 세모입 다예 화이팅 !! ❤️ + + + + //통신 성공 시 수행되는 메소드 + override fun onResponse( + call: Call, + response: Response + ) { + 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("빈칸을 다 채워주세요") + } + + } + +} 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 new file mode 100644 index 0000000..645e81e --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Main/MainActivity.kt @@ -0,0 +1,226 @@ +package com.song2.jeonha.UI.Main + +import android.app.Activity +import android.content.Intent +import android.support.v7.app.AppCompatActivity +import android.os.Bundle +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.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.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 +import retrofit2.Call +import retrofit2.Response + +class MainActivity : AppCompatActivity() { + + var flag_first=0 + + val networkService: NetworkService by lazy { + ApplicationController.instance.networkService + } + + var b : Boolean = false + lateinit var programListRecyclerViewAdapter: ProgramListRecyclerViewAdapter + var arrayListData: ArrayList = ArrayList() + var arrayListClassData: ArrayList = ArrayList() + + lateinit var titleListRecyclerViewAdapter: TitleListRecyclerViewAdapter + var titleListData: ArrayList = ArrayList() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_main) + + iv_main_mypage.setOnClickListener { + startActivity() + } + + iv_main_QRtest.setOnClickListener { + onQrcodeScanner() + } + + getMainProgramsResponse() + setClassProgramRecyclerView(arrayListData) + setTitleRecyclerView() + + setOnBtnClickListener() + switch_main_main_act_selector.setOnCheckedChangeListener { button, checked -> + if (!checked) { + //한옥통신 + Log.e("한옥통신", "In " + switch_main_main_act_selector.isSelected()) + b = false + setClassProgramRecyclerView(arrayListData) + + iv_main_act_more_btn.setOnClickListener { + startActivity() + } + + } else { + //클래스통신 + Log.e("클래스통신", "In " + switch_main_main_act_selector.isSelected()) + b = true + setClassProgramRecyclerView(arrayListClassData) + iv_main_act_more_btn.setOnClickListener { + startActivity() + } + } + } + } + + 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) + + + 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) + + } + + 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) + rv_main_act_title_list.adapter = titleListRecyclerViewAdapter + rv_main_act_title_list.layoutManager = LinearLayoutManager(this) + } + + private fun onQrcodeScanner() { + + + val integrator = IntentIntegrator(this) + integrator.setBeepEnabled(false) + integrator.captureActivity = QRcodeActivity::class.java + integrator.initiateScan() + + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (resultCode == Activity.RESULT_OK) { + val scanResult = IntentIntegrator.parseActivityResult(requestCode, resultCode, data) + val re = scanResult.contents + Toast.makeText(this, "$re", Toast.LENGTH_LONG).show() + } else { + super.onActivityResult(requestCode, resultCode, data) + } + } + + 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") + } + } + }else + Log.e("mainPrograms fail", ":::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) + 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 + ) + arrayListClassData.add(programData) + Log.e("classList Data", ":::confirm") + } + } + +} 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 92% 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 index f799b67..8d03ea7 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/ClassBookingRecyclerViewAdapter.kt similarity index 88% 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 index cedc07b..77c03b3 100644 --- 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 @@ -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,10 +9,8 @@ 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.ProgramData +import com.song2.jeonha.UI.Main.Mypage.MyPageFragment.GetMyBookingList.ClassData 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/UI/Main/Mypage/MyPageFragment/ClassFragment.kt similarity index 87% 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 index f0069ed..946817b 100644 --- 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 @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main.Mypage.MyPageFragment +package com.song2.jeonha.UI.Main.Mypage.MyPageFragment import android.os.Bundle @@ -8,17 +8,14 @@ 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.Main.Mypage.MyPageFragment.GetMyBookingList.GetBookingHanokListResponse -import com.song2.jeonha.Main.ProgramData +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 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/Mypage/MyPageFragment/GetMyBookingList/CData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/CData.kt similarity index 52% 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 index 47a0bb4..6058dde 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassData.kt similarity index 70% 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 index 4212b24..287a537 100644 --- 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 @@ -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/ClassListItemData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt new file mode 100644 index 0000000..265189b --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/ClassListItemData.kt @@ -0,0 +1,10 @@ +package com.song2.jeonha.UI.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/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingClassListResponse.kt similarity index 65% 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 index 16fa2b7..2477d2a 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/GetBookingHanokListResponse.kt similarity index 65% 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 index 73f2331..7405578 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HData.kt similarity index 52% 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 index 2ef4bfb..f0878c2 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/GetMyBookingList/HanokData.kt similarity index 72% 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 index 1eda028..ae522ed 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/HanokStayBookingRecyclerViewAdapter.kt similarity index 90% 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 index daf6d52..7546a7b 100644 --- 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 @@ -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/Main/Mypage/MyPageFragment/StayFragment.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MyPageFragment/StayFragment.kt similarity index 87% 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 index e80982a..b191f31 100644 --- 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 @@ -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/Main/Mypage/MypageActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/MypageActivity.kt similarity index 82% 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 index f4032c3..c3bfb51 100644 --- 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 @@ -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/Main/Mypage/TapAdapter/TapPagerAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/Mypage/TapAdapter/TapPagerAdapter.kt similarity index 86% 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 index 5d67a58..2bde9c1 100644 --- 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 @@ -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/Main/QRcode/QRcodeActivity.java b/app/src/main/java/com/song2/jeonha/UI/Main/QRcode/QRcodeActivity.java similarity index 89% 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 index 95bbd04..16afd9f 100644 --- 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 @@ -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/Main/ProgramListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt similarity index 68% rename from app/src/main/java/com/song2/jeonha/Main/ProgramListRecyclerViewAdapter.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt index 1ee5934..9f88c73 100644 --- a/app/src/main/java/com/song2/jeonha/Main/ProgramListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/ProgramListRecyclerViewAdapter.kt @@ -1,6 +1,7 @@ -package com.song2.jeonha.Main +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 @@ -8,11 +9,15 @@ import android.view.ViewGroup import android.widget.RelativeLayout 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 { @@ -29,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) diff --git a/app/src/main/java/com/song2/jeonha/Main/TitleListRecyclerViewAdapter.kt b/app/src/main/java/com/song2/jeonha/UI/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/UI/Main/adapter/TitleListRecyclerViewAdapter.kt index c7d4c9d..de4c6a9 100644 --- a/app/src/main/java/com/song2/jeonha/Main/TitleListRecyclerViewAdapter.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/adapter/TitleListRecyclerViewAdapter.kt @@ -1,9 +1,7 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.UI.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.UI.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/UI/Main/data/ClassPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt new file mode 100644 index 0000000..b1bd0c5 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/ClassPrograms.kt @@ -0,0 +1,11 @@ +package com.song2.jeonha.UI.Main.data + +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/UI/Main/data/HanokPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt new file mode 100644 index 0000000..19d22a1 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/HanokPrograms.kt @@ -0,0 +1,12 @@ +package com.song2.jeonha.UI.Main.data + + +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/UI/Main/data/MainPrograms.kt b/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt new file mode 100644 index 0000000..e4327c4 --- /dev/null +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/MainPrograms.kt @@ -0,0 +1,6 @@ +package com.song2.jeonha.UI.Main.data + +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/UI/Main/data/ProgramData.kt similarity index 73% rename from app/src/main/java/com/song2/jeonha/Main/ProgramData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt index 1d4b986..07f53e0 100644 --- a/app/src/main/java/com/song2/jeonha/Main/ProgramData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/ProgramData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.UI.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/UI/Main/data/TitleData.kt similarity index 72% rename from app/src/main/java/com/song2/jeonha/Main/TitleData.kt rename to app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt index 08ea3c3..3214d14 100644 --- a/app/src/main/java/com/song2/jeonha/Main/TitleData.kt +++ b/app/src/main/java/com/song2/jeonha/UI/Main/data/TitleData.kt @@ -1,4 +1,4 @@ -package com.song2.jeonha.Main +package com.song2.jeonha.UI.Main.data data class TitleData( var id : Int, 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 95% 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 index 1b22aab..d3b8952 100644 --- a/app/src/main/java/com/song2/jeonha/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,13 +17,13 @@ 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.HanokDatailActivity -import com.song2.jeonha.Map.data.MapData +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 import com.song2.jeonha.R +import com.song2.jeonha.UI.Class.ClassListActivity import kotlinx.android.synthetic.main.activity_map.* import kotlinx.android.synthetic.main.toolbar_map.* import org.jetbrains.anko.startActivity @@ -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 } @@ -286,10 +285,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) } } 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 82% 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 index f34a45a..bc339e9 100644 --- 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 @@ -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/Splash/SplashActivity.kt b/app/src/main/java/com/song2/jeonha/UI/Splash/SplashActivity.kt similarity index 90% 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 index a8f89f1..5036494 100644 --- a/app/src/main/java/com/song2/jeonha/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/drawable-hdpi/appicon_2.png b/app/src/main/res/drawable-hdpi/appicon_2.png new file mode 100644 index 0000000..ccfd197 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/appicon_2.png differ diff --git a/app/src/main/res/drawable-hdpi/naeshi.png b/app/src/main/res/drawable-hdpi/naeshi.png index 50dd624..03b0c69 100644 Binary files a/app/src/main/res/drawable-hdpi/naeshi.png and b/app/src/main/res/drawable-hdpi/naeshi.png differ 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 0000000..14a4887 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/appicon_2.png differ diff --git a/app/src/main/res/drawable-mdpi/naeshi.png b/app/src/main/res/drawable-mdpi/naeshi.png index 6f75bbd..a6d3ea9 100644 Binary files a/app/src/main/res/drawable-mdpi/naeshi.png and b/app/src/main/res/drawable-mdpi/naeshi.png differ 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 0000000..fcfcfbc Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/appicon_2.png differ diff --git a/app/src/main/res/drawable-xhdpi/naeshi.png b/app/src/main/res/drawable-xhdpi/naeshi.png index 0c2141f..cd2369d 100644 Binary files a/app/src/main/res/drawable-xhdpi/naeshi.png and b/app/src/main/res/drawable-xhdpi/naeshi.png differ 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 0000000..3e39534 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/appicon_2.png differ diff --git a/app/src/main/res/drawable-xxhdpi/naeshi.png b/app/src/main/res/drawable-xxhdpi/naeshi.png index aff04e3..0e2e78b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/naeshi.png and b/app/src/main/res/drawable-xxhdpi/naeshi.png differ 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 0000000..eb3da5d Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/appicon_2.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/naeshi.png b/app/src/main/res/drawable-xxxhdpi/naeshi.png index 047ecd8..9bfa3dd 100644 Binary files a/app/src/main/res/drawable-xxxhdpi/naeshi.png and b/app/src/main/res/drawable-xxxhdpi/naeshi.png differ diff --git a/app/src/main/res/drawable/white_gray_border_1dp.xml b/app/src/main/res/drawable/white_gray_border_1dp.xml index 28ff8d7..e2ec2e7 100644 --- a/app/src/main/res/drawable/white_gray_border_1dp.xml +++ b/app/src/main/res/drawable/white_gray_border_1dp.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file 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"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_class_list.xml b/app/src/main/res/layout/activity_class_list.xml index c833d83..9d3c551 100644 --- a/app/src/main/res/layout/activity_class_list.xml +++ b/app/src/main/res/layout/activity_class_list.xml @@ -7,7 +7,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".Class.ClassListActivity"> + tools:context=".UI.Class.ClassListActivity"> - + tools:context=".UI.Hanok.HanokDetailActivity"> - - - - + 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,246 +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 diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index d5e16a9..687b8b0 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -5,7 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".Login.LoginActivity"> + tools:context=".UI.Login.LoginActivity"> @@ -62,6 +62,7 @@ - - - + + + @@ -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"> @@ -51,24 +51,24 @@ + android:layout_marginTop="20.5dp" + android:scrollbars="none"> + android:layout_width="99dp" + android:layout_height="99dp" + 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/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"> - + android:layout_height="wrap_content"> - + + + + - - + + + + + + + - + android:layout_height="wrap_content"> - + + + - - + + + - - + + + + + tools:context=".UI.Splash.SplashActivity"> \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_hanok.xml b/app/src/main/res/layout/dialog_hanok.xml index 3cae145..52454d1 100644 --- a/app/src/main/res/layout/dialog_hanok.xml +++ b/app/src/main/res/layout/dialog_hanok.xml @@ -27,7 +27,6 @@ android:id="@+id/rg_dialog_hanok" android:layout_width="match_parent" android:layout_height="wrap_content" - android:checkedButton="@id/dialog_hanok_maphogu" android:orientation="vertical"> + + + + + + + + + + + + + + + + + \ No newline at end of file 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 @@ 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"> + android:background="@color/dark"/> + + + + + + + + + \ No newline at end of file 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"> diff --git a/app/src/main/res/layout/rv_item_hanok_filter.xml b/app/src/main/res/layout/rv_item_hanok_filter.xml index 22b26cd..05f6041 100644 --- a/app/src/main/res/layout/rv_item_hanok_filter.xml +++ b/app/src/main/res/layout/rv_item_hanok_filter.xml @@ -13,6 +13,7 @@ android:orientation="vertical"> #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 @@