#7 Implement add drink layout

alcohol-king · Jan 18, 2019 · 6ddaee0 · 6ddaee0
1 parent f1f449d
commit 6ddaee0
Show file tree

Hide file tree

Showing 14 changed files with 442 additions and 131 deletions.
diff --git a/app/src/main/java/com/sooling/sooling/activity/add_drink/AddHistoryActivity.kt b/app/src/main/java/com/sooling/sooling/activity/add_drink/AddHistoryActivity.kt
@@ -1,50 +1,126 @@
 package com.sooling.sooling.activity.add_drink
 
 import android.app.DatePickerDialog
+import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
+import android.view.Gravity
+import android.view.View
+import android.widget.Button
 import com.sooling.sooling.R
+import com.sooling.sooling.model.GetCardData
 import kotlinx.android.synthetic.main.activity_add_history.*
+import kotlinx.android.synthetic.main.toolbar.*
+import org.jetbrains.anko.*
 import java.util.*
 
-class AddHistoryActivity : AppCompatActivity() {
+class AddHistoryActivity : AppCompatActivity(), View.OnClickListener {
+    lateinit var drinkBtns: ArrayList<Button>
+    lateinit var capacityBtns: ArrayList<Button>
+    var drinkBtnStatus = BooleanArray(4)
+    var beerBtnStatus = BooleanArray(8)
+    var sojuStatus = BooleanArray(8)
+    var wineStatus = BooleanArray(8)
+    var makgeolliStatus = BooleanArray(8)
+
+    val c = Calendar.getInstance()
+    var year = c.get(Calendar.YEAR)
+    var month = c.get(Calendar.MONTH)
+    var day = c.get(Calendar.DAY_OF_MONTH)
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_add_history)
-        setSupportActionBar(toolbar_main)
+
+        drinkBtns = arrayListOf(
+                btn_add_beer, btn_add_soju, btn_add_wine, btn_add_makgeolli
+        )
+
+        capacityBtns = arrayListOf(
+                btn_capacity1, btn_capacity2, btn_capacity3, btn_capacity4,
+                btn_capacity5, btn_capacity6, btn_capacity7, btn_capacity8
+        )
 
         initView()
     }
 
     private fun initView() {
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        supportActionBar?.setTitle(R.string.all_add_history)
+        toolbar_title.text = getString(R.string.all_add_history)
+        btn_add_date.text = getDateStr(year, month, day)
+
+        drinkBtns.forEachIndexed { index, btn ->
+            btn.setOnClickListener {
+                drinkBtnStatus[index] = !drinkBtnStatus[index]
+                btn.backgroundDrawable =
+                        resources.getDrawable(
+                                if (drinkBtnStatus[index]) R.drawable.back_rect_black2
+                                else R.drawable.back_rect_gray
+                        ) as Drawable
+                btn.textColor =
+                        if (drinkBtnStatus[index]) Color.WHITE
+                        else R.color.colorDarkerGray
 
-        iv_minus.setOnClickListener {
-            var count = tv_count.text.toString().toInt()
-            if (count > 0)
-                tv_count.text = (--count).toString()
+                val capacityStr = GetCardData(this).getCapacityArray(btn.text.toString())
+                /*capacityBtns.forEachIndexed { index, btn ->
+                    btn.text = capacityStr[index]
+                    btn.backgroundColor =
+                            if (beerBtnStatus[index]) Color.BLACK
+                            else Color.TRANSPARENT
+                }*/
+            }
         }
 
-        iv_plus.setOnClickListener {
-            var count = tv_count.text.toString().toInt()
-            tv_count.text = (++count).toString()
+        capacityBtns.forEachIndexed { index, btn ->
+            if (index < 6) {
+
+            } else {
+
+            }
         }
 
-        val c = Calendar.getInstance()
-        val year = c.get(Calendar.YEAR)
-        val month = c.get(Calendar.MONTH)
-        val day = c.get(Calendar.DAY_OF_MONTH)
+        ib_back.setOnClickListener(this)
+        iv_minus.setOnClickListener(this)
+        iv_plus.setOnClickListener(this)
+        btn_add_date.setOnClickListener(this)
+    }
 
-        btn_add_date.text = getDateStr(year, month, day)
-        btn_add_date.setOnClickListener {
-            val datePicker = DatePickerDialog(this,
-                    DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
-                        btn_add_date.text = getDateStr(year, monthOfYear, dayOfMonth)
-                    }, year, month, day)
+    fun showInputCapacityDialog() {
+        alert {
+            linearLayout {
+                gravity = Gravity.CENTER_HORIZONTAL
+                textView("더 많이요? 그러다 죽어요!\n적당한 음주를 권장합니다.ㅜㅜ")
+                editText {
+
+                }
+                view {
+                }
+            }
+        }.show()
+    }
+
+    override fun onClick(view: View?) {
+        when (view?.id) {
+            R.id.ib_back -> finish()
+            R.id.iv_minus -> {
+                var count = tv_count.text.toString().toInt()
+                if (count > 0) tv_count.text = (--count).toString()
+            }
+            R.id.iv_plus -> {
+                var count = tv_count.text.toString().toInt()
+                tv_count.text = (++count).toString()
+            }
+            R.id.btn_add_date -> {
+                val datePicker = DatePickerDialog(this,
+                        DatePickerDialog.OnDateSetListener { _, year, monthOfYear, dayOfMonth ->
+                            this.year = year
+                            this.month = monthOfYear
+                            this.day = dayOfMonth
+                            btn_add_date.text = getDateStr(year, month, day)
+                        }, year, month, day)
 
-            datePicker.show()
+                datePicker.show()
+            }
         }
     }
 

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
@@ -9,6 +9,7 @@ import android.view.View
 import android.widget.TextView
 import com.sooling.sooling.R
 import kotlinx.android.synthetic.main.activity_setting.*
+import kotlinx.android.synthetic.main.toolbar.*
 import org.jetbrains.anko.startActivity
 
 
@@ -23,19 +24,22 @@ class SettingActivity : AppCompatActivity(), View.OnClickListener {
 
     private fun initView() {
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        toolbar_title.text = getString(R.string.all_setting)
 
         // 추천 버튼에 색상 지정
         val span = SpannableStringBuilder(getString(R.string.setting_friend))
         span.setSpan(ForegroundColorSpan(resources.getColor(R.color.colorBeer))
                 , 4, 9, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
         btn_recommend.setText(span, TextView.BufferType.SPANNABLE)
 
+        ib_back.setOnClickListener(this)
         btn_profile.setOnClickListener(this)
         btn_card.setOnClickListener(this)
     }
 
     override fun onClick(view: View?) {
         when (view?.id) {
+            R.id.ib_back -> finish()
             R.id.btn_profile -> startActivity<SettingProfileActivity>()
             R.id.btn_card -> startActivity<SettingCardActivity>()
         }

diff --git a/app/src/main/java/com/sooling/sooling/activity/setting/SettingCardActivity.kt b/app/src/main/java/com/sooling/sooling/activity/setting/SettingCardActivity.kt
@@ -4,14 +4,26 @@ import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import android.view.View
 import com.sooling.sooling.R
+import kotlinx.android.synthetic.main.toolbar.*
 
 class SettingCardActivity : AppCompatActivity(), View.OnClickListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_setting_card)
+
+        initView()
+    }
+
+    private fun initView() {
+        toolbar_title.text = getString(R.string.setting_card)
+
+        ib_back.setOnClickListener(this)
     }
 
     override fun onClick(view: View?) {
+        when(view?.id) {
+            R.id.ib_back -> finish()
+        }
     }
 }
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
@@ -8,6 +8,7 @@ import com.bumptech.glide.Glide
 import com.bumptech.glide.request.RequestOptions
 import com.sooling.sooling.R
 import kotlinx.android.synthetic.main.activity_setting_profile.*
+import kotlinx.android.synthetic.main.toolbar.*
 
 class SettingProfileActivity : AppCompatActivity(), View.OnClickListener {
     val pickPhoto = 1
@@ -21,16 +22,23 @@ class SettingProfileActivity : AppCompatActivity(), View.OnClickListener {
     }
 
     private fun initView() {
+        toolbar_title.text = getString(R.string.setting_profile)
+
         Glide.with(applicationContext)
                 .load(R.drawable.icon)
                 .apply(RequestOptions().circleCrop())
                 .into(iv_setting_profile)
+
+        ib_back.setOnClickListener(this)
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
     }
 
-    override fun onClick(p0: View?) {
+    override fun onClick(view: View?) {
+        when(view?.id) {
+            R.id.ib_back -> finish()
+        }
     }
 }
diff --git a/app/src/main/java/com/sooling/sooling/model/GetCardData.kt b/app/src/main/java/com/sooling/sooling/model/GetCardData.kt
@@ -40,4 +40,13 @@ class GetCardData(val context: Context) {
                 beer -> R.drawable.img_beer
                 else -> R.drawable.img_beer
             }
+
+    fun getCapacityArray(type: String): Array<String> = context.resources.getStringArray(
+            when (type) {
+                beer -> R.array.beer_capacity
+                wine -> R.array.wine_capacity
+                soju -> R.array.soju_capacity
+                makgeolli -> R.array.makeolli_capacity
+                else -> R.array.beer_capacity
+            })
 }
diff --git a/app/src/main/res/drawable/back_rect_black3.xml b/app/src/main/res/drawable/back_rect_black3.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/black" />
+
+    <solid android:color="@android:color/white" />
+
+    <corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/back_rect_gray.xml b/app/src/main/res/drawable/back_rect_gray.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <stroke
+        android:width="1dp"
+        android:color="@android:color/darker_gray" />
+
+    <solid android:color="@android:color/white" />
+
+    <corners android:radius="100dp" />
+</shape>
diff --git a/app/src/main/res/drawable/ic_arrow_back_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+</vector>