From 92f99b9b4261db733942c132e35bd5cce003857f Mon Sep 17 00:00:00 2001 From: zion830 Date: Fri, 25 Jan 2019 23:08:50 +0900 Subject: [PATCH] #5 Edit name and status message --- .../sooling/activity/main/MainActivity.kt | 33 +++++++++--- .../activity/setting/SettingActivity.kt | 21 +++++++- .../setting/SettingProfileActivity.kt | 47 +++++++++++++++--- .../sooling/custom_view/ShareDialog.kt | 3 +- .../com/sooling/sooling/model/GetCardData.kt | 4 +- .../sooling/network/RetrofitBuilder.kt | 19 ------- .../com/sooling/sooling/network/ServiceAPI.kt | 15 ------ .../sooling/network/UserInfoServiceAPI.kt | 18 +++++++ .../sooling/util/ShareCardWithKakaoTalk.kt | 7 +++ .../sooling/sooling/util/UserDataManager.kt | 9 ++++ app/src/main/res/drawable/img_makgeolli.png | Bin 0 -> 27995 bytes app/src/main/res/drawable/img_soju.png | Bin 0 -> 33037 bytes app/src/main/res/drawable/img_wine.png | Bin 0 -> 17009 bytes .../res/layout/activity_setting_profile.xml | 1 + app/src/main/res/values/strings.xml | 3 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 3 +- 17 files changed, 132 insertions(+), 53 deletions(-) delete mode 100644 app/src/main/java/com/sooling/sooling/network/RetrofitBuilder.kt delete mode 100644 app/src/main/java/com/sooling/sooling/network/ServiceAPI.kt create mode 100644 app/src/main/java/com/sooling/sooling/network/UserInfoServiceAPI.kt create mode 100644 app/src/main/res/drawable/img_makgeolli.png create mode 100644 app/src/main/res/drawable/img_soju.png create mode 100644 app/src/main/res/drawable/img_wine.png diff --git a/app/src/main/java/com/sooling/sooling/activity/main/MainActivity.kt b/app/src/main/java/com/sooling/sooling/activity/main/MainActivity.kt index 824688f..48c65c4 100644 --- a/app/src/main/java/com/sooling/sooling/activity/main/MainActivity.kt +++ b/app/src/main/java/com/sooling/sooling/activity/main/MainActivity.kt @@ -1,6 +1,7 @@ package com.sooling.sooling.activity.main import android.Manifest +import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle import android.support.v4.app.ActivityCompat @@ -8,14 +9,13 @@ import android.support.v7.app.AppCompatActivity import android.support.v7.widget.LinearLayoutManager import android.support.v7.widget.PagerSnapHelper import android.support.v7.widget.RecyclerView -import android.util.Log.d import android.view.View import com.bumptech.glide.Glide import com.bumptech.glide.request.RequestOptions import com.sooling.sooling.R import com.sooling.sooling.`object`.DrinkCard +import com.sooling.sooling.`object`.User import com.sooling.sooling.activity.add_drink.AddHistoryActivity -import com.sooling.sooling.activity.calendar.CalendarActivity import com.sooling.sooling.activity.setting.SettingActivity import com.sooling.sooling.activity.wiki.WikiActivity import com.sooling.sooling.adapter.CardListAdapter @@ -24,14 +24,18 @@ import com.sooling.sooling.custom_view.ShareDialog import com.sooling.sooling.util.RecyclerItemClickListener import com.sooling.sooling.util.UserDataManager import kotlinx.android.synthetic.main.activity_main.* +import org.jetbrains.anko.alert import org.jetbrains.anko.startActivity +import org.jetbrains.anko.startActivityForResult import org.jetbrains.anko.toast class MainActivity : AppCompatActivity(), View.OnClickListener { val requestPermission = 0 + val codeSetting = 1 var index = 0 lateinit var adapter: CardListAdapter + lateinit var user: User var cardList = listOf( DrinkCard("BEER", "500cc까지는 즐기면서"), DrinkCard("SOJU", "3잔까지는 멀쩡하게"), @@ -47,9 +51,8 @@ class MainActivity : AppCompatActivity(), View.OnClickListener { askForPermission() } - private fun initView() { - val user = UserDataManager.getInstance(this).getUserInfo() - d("token", user.token) + private fun initInfo() { + user = UserDataManager.getInstance(this).getUserInfo() Glide.with(applicationContext) .load(user.imgUrl) .apply(RequestOptions().circleCrop()) @@ -57,6 +60,10 @@ class MainActivity : AppCompatActivity(), View.OnClickListener { tv_main_name.text = user.name tv_main_msg.text = user.msg + } + + private fun initView() { + initInfo() adapter = CardListAdapter(this, cardList) rv_main_card.adapter = adapter @@ -105,15 +112,25 @@ class MainActivity : AppCompatActivity(), View.OnClickListener { override fun onClick(view: View?) { when (view?.id) { R.id.btn_main_capacity -> startActivity() - R.id.btn_main_calendar -> startActivity() + R.id.btn_main_calendar -> alert { + title = "송구합니다..." + message = "캘린더는 아직 개발 중입니다...\n다음 업데이트를 기다려주십쇼." + positiveButton("납득", onClicked = {}) + }.show() R.id.btn_main_wiki -> startActivity() - R.id.btn_main_setting -> startActivity() + R.id.btn_main_setting -> startActivityForResult(codeSetting) R.id.btn_main_share -> { - ShareDialog(this, cardList[index], "유우미").show() + ShareDialog(this, cardList[index], user.name).show() } } } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + if (requestCode == codeSetting) + initInfo() + } + // 권한 요청 private fun askForPermission() { val permissions = arrayOf(android.Manifest.permission.WRITE_EXTERNAL_STORAGE, android.Manifest.permission.CAMERA) diff --git a/app/src/main/java/com/sooling/sooling/activity/setting/SettingActivity.kt b/app/src/main/java/com/sooling/sooling/activity/setting/SettingActivity.kt index 89b4681..965ec16 100644 --- a/app/src/main/java/com/sooling/sooling/activity/setting/SettingActivity.kt +++ b/app/src/main/java/com/sooling/sooling/activity/setting/SettingActivity.kt @@ -11,6 +11,7 @@ import com.sooling.sooling.R import com.sooling.sooling.util.ShareCardWithKakaoTalk import kotlinx.android.synthetic.main.activity_setting.* import kotlinx.android.synthetic.main.toolbar.* +import org.jetbrains.anko.alert import org.jetbrains.anko.startActivity @@ -19,6 +20,7 @@ class SettingActivity : AppCompatActivity(), View.OnClickListener { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_setting) + initView() } @@ -35,13 +37,30 @@ class SettingActivity : AppCompatActivity(), View.OnClickListener { ib_back.setOnClickListener(this) btn_profile.setOnClickListener(this) btn_card.setOnClickListener(this) + btn_recommend.setOnClickListener(this) } override fun onClick(view: View?) { when (view?.id) { - R.id.ib_back -> finish() + R.id.ib_back -> showSaveDialog() R.id.btn_profile -> startActivity() R.id.btn_card -> startActivity() + R.id.btn_recommend -> ShareCardWithKakaoTalk(this).excuteRecommend() } } + + override fun onDestroy() { + showSaveDialog() + + super.onDestroy() + } + + fun showSaveDialog() { + alert { + title = getString(R.string.setting_save) + message = getString(R.string.setting_save_msg) + positiveButton(getString(R.string.all_ok), onClicked = {}) + negativeButton(getString(R.string.all_cancel), onClicked = { finish() }) + }.show() + } } \ No newline at end of file diff --git a/app/src/main/java/com/sooling/sooling/activity/setting/SettingProfileActivity.kt b/app/src/main/java/com/sooling/sooling/activity/setting/SettingProfileActivity.kt index 1ba0b7b..f9e3000 100644 --- a/app/src/main/java/com/sooling/sooling/activity/setting/SettingProfileActivity.kt +++ b/app/src/main/java/com/sooling/sooling/activity/setting/SettingProfileActivity.kt @@ -6,27 +6,28 @@ import android.support.v7.app.AppCompatActivity import android.view.View import android.widget.Button import com.bumptech.glide.Glide -import com.bumptech.glide.load.engine.Resource import com.bumptech.glide.request.RequestOptions import com.sooling.sooling.R import com.sooling.sooling.model.GetCardData +import com.sooling.sooling.util.UserDataManager import kotlinx.android.synthetic.main.activity_setting_profile.* import kotlinx.android.synthetic.main.toolbar.* -import android.animation.PropertyValuesHolder -import android.animation.ObjectAnimator -import android.graphics.drawable.Drawable +import org.jetbrains.anko.alert +import org.jetbrains.anko.toast class SettingProfileActivity : AppCompatActivity(), View.OnClickListener { val pickPhoto = 1 val takePicture = 2 lateinit var labelBtns: ArrayList