Merge branch 'palete-view'

src/main/java/com/bomostory/sceneeditmodule/DialogueDrawer.kt

@@ -20,7 +20,7 @@ object DialogueDrawer {
         val textPaint = Paint()
         textPaint.strokeWidth = 1f
         textPaint.isAntiAlias = true
-        textPaint.color = Color.parseColor(data.textColor)
+        textPaint.color = data.textColor
         textPaint.textSize = 40f
         textPaint.textAlign = data.textAlign
         var mResId = data.resourcePath.toInt()

src/main/java/com/bomostory/sceneeditmodule/EditTextDialog.kt

@@ -1,21 +1,25 @@
 package com.bomostory.sceneeditmodule
 
 import android.content.DialogInterface
+import android.graphics.Color
 import android.graphics.Paint
 import android.os.Bundle
 import android.support.v4.app.DialogFragment
 import android.support.v4.content.ContextCompat
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.view.Window
+import android.view.*
+import android.widget.PopupWindow
+import android.widget.SeekBar
 import com.bomostory.sceneeditmodule.basicdata.Actor
 import com.example.tfat.myapplication.R
+import kotlinx.android.synthetic.main.dialogfragment_edit_text.*
 import kotlinx.android.synthetic.main.dialogfragment_edit_text.view.*
+import kotlinx.android.synthetic.main.popupview_set_color.view.*
+
 
 class EditTextDialog : DialogFragment() {
-    var onSetDialogFinish: OnSetDialogFinish? = null
-    lateinit var dialogueActor: Actor
+    private var onSetDialogFinish: OnSetDialogFinish? = null
+    private lateinit var dialogueActor: Actor
+    private var popupWindow = PopupWindow()
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
         return inflater.inflate(R.layout.dialogfragment_edit_text, container).apply {
@@ -29,7 +33,9 @@ class EditTextDialog : DialogFragment() {
                 iv_edit_text_blue.background = null
                 iv_edit_text_green.background = null
                 iv_edit_text_black.background = null
-                dialogueActor?.textColor = "#d0021b"
+                dialogueActor?.textColor = Color.parseColor("#d0021b")
+                etv_text.setTextColor(dialogueActor?.textColor)
+                popupWindow.dismiss()
             }
             iv_edit_text_yellow.setOnClickListener {
                 iv_edit_text_red.background = null
@@ -37,7 +43,9 @@ class EditTextDialog : DialogFragment() {
                 iv_edit_text_blue.background = null
                 iv_edit_text_green.background = null
                 iv_edit_text_black.background = null
-                dialogueActor?.textColor = "#f8e71c"
+                dialogueActor?.textColor = Color.parseColor("#f8e71c")
+                etv_text.setTextColor(dialogueActor?.textColor)
+                popupWindow.dismiss()
             }
             iv_edit_text_blue.setOnClickListener {
                 iv_edit_text_red.background = null
@@ -45,7 +53,9 @@ class EditTextDialog : DialogFragment() {
                 iv_edit_text_blue.background = ContextCompat.getDrawable(context, R.drawable.btn_edit_text_dialog_circle_selected)
                 iv_edit_text_green.background = null
                 iv_edit_text_black.background = null
-                dialogueActor?.textColor = "#4a90e2"
+                dialogueActor?.textColor = Color.parseColor("#4a90e2")
+                etv_text.setTextColor(dialogueActor?.textColor)
+                popupWindow.dismiss()
             }
             iv_edit_text_green.setOnClickListener {
                 iv_edit_text_red.background = null
@@ -53,7 +63,9 @@ class EditTextDialog : DialogFragment() {
                 iv_edit_text_blue.background = null
                 iv_edit_text_green.background = ContextCompat.getDrawable(context, R.drawable.btn_edit_text_dialog_circle_selected)
                 iv_edit_text_black.background = null
-                dialogueActor?.textColor = "#417505"
+                dialogueActor?.textColor = Color.parseColor("#417505")
+                etv_text.setTextColor(dialogueActor?.textColor)
+                popupWindow.dismiss()
             }
             iv_edit_text_black.setOnClickListener {
                 iv_edit_text_red.background = null
@@ -61,7 +73,23 @@ class EditTextDialog : DialogFragment() {
                 iv_edit_text_blue.background = null
                 iv_edit_text_green.background = null
                 iv_edit_text_black.background = ContextCompat.getDrawable(context, R.drawable.btn_edit_text_dialog_circle_selected)
-                dialogueActor?.textColor = "#000000"
+                dialogueActor?.textColor = Color.parseColor("#000000")
+                etv_text.setTextColor(dialogueActor?.textColor)
+                popupWindow.dismiss()
+
+            }
+            iv_edit_text_tune.setOnClickListener {
+                iv_edit_text_red.background = null
+                iv_edit_text_yellow.background = null
+                iv_edit_text_blue.background = null
+                iv_edit_text_green.background = null
+                iv_edit_text_black.background = null
+                popupWindow.contentView = createPopupView()
+                popupWindow.width = ViewGroup.LayoutParams.WRAP_CONTENT
+                popupWindow.height = ViewGroup.LayoutParams.WRAP_CONTENT
+                popupWindow.isOutsideTouchable = false
+                var valueXInPixels = resources.getDimension(R.dimen.popup_view_set_color_height)
+                popupWindow.showAsDropDown(iv_edit_text_tune, 0, -valueXInPixels.toInt(), Gravity.CENTER_HORIZONTAL)
             }
             btn_edit_dialog_align_left.setOnClickListener {
                 btn_edit_dialog_align_left.setImageResource(R.drawable.ic_alignleft_w)
@@ -84,6 +112,68 @@ class EditTextDialog : DialogFragment() {
         }
     }
 
+    private fun createPopupView(): View{
+        val popupView = LayoutInflater.from(context).inflate(R.layout.popupview_set_color, null)
+        popupView.sb_set_color_r.max = 255
+        popupView.sb_set_color_r.progress = 255
+        popupView.sb_set_color_r.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                popupView.tv_set_color_r.text = progress.toString()
+                dialogueActor?.textColor = Color.argb(popupView.tv_set_color_a.text.toString().toInt(),popupView.tv_set_color_r.text.toString().toInt(),
+                        popupView.tv_set_color_g.text.toString().toInt(),popupView.tv_set_color_b.text.toString().toInt())
+                etv_text.setTextColor(dialogueActor?.textColor)
+            }
+            override fun onStartTrackingTouch(p0: SeekBar?) {
+            }
+            override fun onStopTrackingTouch(p0: SeekBar?) {
+            }
+        })
+        popupView.sb_set_color_g.max = 255
+        popupView.sb_set_color_g.progress = 255
+        popupView.sb_set_color_g.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                popupView.tv_set_color_g.text = progress.toString()
+                dialogueActor?.textColor = Color.argb(popupView.tv_set_color_a.text.toString().toInt(),popupView.tv_set_color_r.text.toString().toInt(),
+                        popupView.tv_set_color_g.text.toString().toInt(),popupView.tv_set_color_b.text.toString().toInt())
+                etv_text.setTextColor(dialogueActor?.textColor)
+            }
+            override fun onStartTrackingTouch(p0: SeekBar?) {
+            }
+            override fun onStopTrackingTouch(p0: SeekBar?) {
+            }
+        })
+        popupView.sb_set_color_b.max = 255
+        popupView.sb_set_color_b.progress = 255
+        popupView.sb_set_color_b.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                popupView.tv_set_color_b.text = progress.toString()
+                dialogueActor?.textColor = Color.argb(popupView.tv_set_color_a.text.toString().toInt(),popupView.tv_set_color_r.text.toString().toInt(),
+                        popupView.tv_set_color_g.text.toString().toInt(),popupView.tv_set_color_b.text.toString().toInt())
+                etv_text.setTextColor(dialogueActor?.textColor)
+            }
+            override fun onStartTrackingTouch(p0: SeekBar?) {
+            }
+            override fun onStopTrackingTouch(p0: SeekBar?) {
+            }
+        })
+        popupView.sb_set_color_a.max = 255
+        popupView.sb_set_color_a.progress = 255
+        popupView.sb_set_color_a.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
+            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
+                popupView.tv_set_color_r.text = progress.toString()
+                dialogueActor?.textColor = Color.argb(popupView.tv_set_color_a.text.toString().toInt(),popupView.tv_set_color_r.text.toString().toInt(),
+                        popupView.tv_set_color_g.text.toString().toInt(),popupView.tv_set_color_b.text.toString().toInt())
+                etv_text.setTextColor(dialogueActor?.textColor)
+
+            }
+            override fun onStartTrackingTouch(p0: SeekBar?) {
+            }
+            override fun onStopTrackingTouch(p0: SeekBar?) {
+            }
+        })
+        return popupView
+    }
+
     override fun onDismiss(dialog: DialogInterface?) {
         super.onDismiss(dialog)
         onSetDialogFinish?.onEditTextDialogDismiss()

src/main/java/com/bomostory/sceneeditmodule/SceneEditActivity.kt

@@ -12,6 +12,7 @@ import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.LinearLayoutManager
 import android.support.v7.widget.RecyclerView
 import android.util.DisplayMetrics
+import android.util.Log
 import android.view.*
 import android.widget.PopupWindow
 import android.widget.SeekBar
@@ -299,7 +300,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
         })
         navigationBarView.setonClickSettingBtn(View.OnClickListener {
             var popupWindow = PopupWindow(this)
-            popupWindow.contentView = createSettingPopupView(popupWindow)
+            popupWindow.contentView = createSettingPopupView()
             popupWindow.width = ViewGroup.LayoutParams.WRAP_CONTENT
             popupWindow.height = ViewGroup.LayoutParams.WRAP_CONTENT
             popupWindow.isOutsideTouchable = true
@@ -309,7 +310,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
         })
     }
 
-    private fun createSettingPopupView(popupWindow: PopupWindow): View{
+    private fun createSettingPopupView(): View{
         val popupView = LayoutInflater.from(this).inflate(R.layout.popupview_setting, null)
         when (isAutoSwipe) {
             true -> {
@@ -414,7 +415,6 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
         var actorRecyclerView = selectActorView.findViewById<RecyclerView>(R.id.select_actor_recycler_view)
         actorRecyclerView.layoutManager = layoutManager
         actorRecyclerView.adapter = actorAdapter
-        actorRecyclerView.isNestedScrollingEnabled = false
         viewContainer.addView(selectActorView)
         selectActorView.layoutParams.width = monitorSize.widthPixels
         selectActorView.btn_object.setOnClickListener {
@@ -1021,6 +1021,8 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                         isMovable = true
                         opacity = actor.opacity
                         isMirror = actor.isMirror
+                        dialogType = actor.dialogType
+                        dialogColor = actor.dialogColor
                     }
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(actorData)
                     setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
@@ -1144,6 +1146,8 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                         isDialogue = actor.isDialogue
                         opacity = actor.opacity
                         isMirror = actor.isMirror
+                        dialogType = actor.dialogType
+                        dialogColor = actor.dialogColor
                     }
                     it[currentSceneIndex].layers[currentLayerIndex].actors.add(actorData)
                     setActorPositionZ(it[currentSceneIndex].layers[currentLayerIndex].actors)
@@ -1185,6 +1189,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                     it.scenes?.let {
                         it[currentSceneIndex].layers[currentLayerIndex].actors[actor.positionZ].resourcePath = DialogueColorData.dialogMap[Pair(actor.dialogType,0)].toString()
                         it[currentSceneIndex].layers[currentLayerIndex].actors[actor.positionZ].dialogColor = 0
+
                         sceneEditView.scene = it[currentSceneIndex]
                     }
                 }
@@ -1216,6 +1221,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                         sceneEditView.scene = it[currentSceneIndex]
                     }
                 }
+                sceneEditView.setLayerVisible(currentLayerIndex)
             }
             popupView.iv_dialogue_set_color_green.setOnClickListener {
                 popupView.iv_dialogue_set_color_white.setImageDrawable(null)
@@ -1230,6 +1236,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                         sceneEditView.scene = it[currentSceneIndex]
                     }
                 }
+                sceneEditView.setLayerVisible(currentLayerIndex)
             }
             popupView.iv_dialogue_set_color_orange.setOnClickListener {
                 popupView.iv_dialogue_set_color_white.setImageDrawable(null)
@@ -1244,6 +1251,7 @@ class SceneEditActivity : AppCompatActivity(), ActorAdapter.OnActorDragListener,
                         sceneEditView.scene = it[currentSceneIndex]
                     }
                 }
+                sceneEditView.setLayerVisible(currentLayerIndex)
             }
             popupView.tv_color_dialog_ok.setOnClickListener {
                 popupWindow.dismiss()

src/main/java/com/bomostory/sceneeditmodule/basicdata/Actor.kt

@@ -1,5 +1,6 @@
 package com.bomostory.sceneeditmodule.basicdata
 
+import android.graphics.Color
 import android.graphics.Paint
 
 open class Actor {
@@ -13,7 +14,7 @@ open class Actor {
     var parentLayerIndex = 0
     var isMovable: Boolean = false
     var text: String = ""
-    var textColor = "#000000"
+    var textColor = Color.BLACK
     var textAlign = Paint.Align.LEFT
     var isDialogue = false
     var isMirror = false

src/main/java/com/bomostory/sceneeditmodule/navigationbar/actor/ActorAdapter.kt

@@ -81,6 +81,7 @@ class ActorAdapter(var context : Context, var data: ArrayList<ArrayList<String>>
             itemView.findViewById<ImageView>(R.id.actor_image).setImageDrawable(Drawable.createFromPath(path))
             itemView.findViewById<ImageView>(R.id.actor_image).setOnTouchListener(boMoOnTouchListener(position,0))
             itemView.actor_rotate.apply {
+                isNestedScrollingEnabled = false
                 var onClickListeners = ArrayList<View.OnClickListener>()
                 for (i in 0 until data.size) {
                     onClickListeners.add(View.OnClickListener {
@@ -92,6 +93,17 @@ class ActorAdapter(var context : Context, var data: ArrayList<ArrayList<String>>
                 layoutManager = LinearLayoutManager(context).apply {
                     orientation = LinearLayoutManager.HORIZONTAL
                 }
+                addOnScrollListener(object : RecyclerView.OnScrollListener(){
+                    override fun onScrollStateChanged(recyclerView: RecyclerView, newState: Int) {
+                        super.onScrollStateChanged(recyclerView, newState)
+                        Log.d("TEST12345","11111")
+                    }
+
+                    override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                        super.onScrolled(recyclerView, dx, dy)
+                        Log.d("TEST12345","22222")
+                    }
+                })
             }
         }
         private fun boMoOnTouchListener(position: Int, index: Int) : View.OnTouchListener {

src/main/java/com/bomostory/sceneeditmodule/screen/view/DialogueView.kt

@@ -157,9 +157,9 @@ class DialogueView : EditActorView{
                         isMovable = dialogue.isMovable
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
-                        opacity = actor.opacity
-                        dialogColor = actor.dialogColor
-                        dialogType = actor.dialogType
+                        opacity = dialogue.opacity
+                        dialogColor = dialogue.dialogColor
+                        dialogType = dialogue.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -226,9 +226,9 @@ class DialogueView : EditActorView{
                         isMovable = dialogue.isMovable
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
-                        opacity = actor.opacity
-                        dialogColor = actor.dialogColor
-                        dialogType = actor.dialogType
+                        opacity = dialogue.opacity
+                        dialogColor = dialogue.dialogColor
+                        dialogType = dialogue.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -293,9 +293,9 @@ class DialogueView : EditActorView{
                         isMovable = dialogue.isMovable
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
-                        opacity = actor.opacity
-                        dialogColor = actor.dialogColor
-                        dialogType = actor.dialogType
+                        opacity = dialogue.opacity
+                        dialogColor = dialogue.dialogColor
+                        dialogType = dialogue.dialogType
                     }
                     dialogue = dialogueData
                 }
@@ -360,9 +360,9 @@ class DialogueView : EditActorView{
                         isMovable = dialogue.isMovable
                         isDialogue = dialogue.isDialogue
                         isMirror = dialogue.isMirror
-                        opacity = actor.opacity
-                        dialogColor = actor.dialogColor
-                        dialogType = actor.dialogType
+                        opacity = dialogue.opacity
+                        dialogColor = dialogue.dialogColor
+                        dialogType = dialogue.dialogType
                     }
                     dialogue = dialogueData
                 }

src/main/res/layout/dialogfragment_edit_text.xml

@@ -96,15 +96,16 @@
             android:scaleType="center"
             android:layout_width="30dp"
             android:layout_height="30dp" />
-        <Button
-            android:drawableStart="@drawable/ic_tune"
-            android:background="#212121"
+        <ImageView
+            android:id="@+id/iv_edit_text_tune"
+            android:src="@drawable/ic_tune"
+            android:layout_marginTop="6dp"
             android:layout_marginRight="12dp"
             android:layout_marginLeft="12dp"
-            android:layout_width="24dp"
-            android:layout_height="24dp" />
-
-        <Button
+            android:scaleType="center"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
+       <Button
             android:id="@+id/btn_edit_dialog_done"
             android:text="DONE"
             android:textColor="#ffecb3"

src/main/res/layout/item_actor.xml

@@ -16,7 +16,7 @@
         <android.support.v7.widget.RecyclerView
             android:id="@+id/actor_rotate"
             android:nestedScrollingEnabled="false"
-            android:layout_width="wrap_content"
+            android:layout_width="200dp"
             android:layout_height="159dp"
             android:orientation="horizontal">
         </android.support.v7.widget.RecyclerView>

src/main/res/layout/popupview_set_color.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="248dp"
+    android:layout_height="288dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:background="@drawable/btn_round_corner_white"
+    android:padding="12dp">
+    <ImageView
+        android:id="@+id/iv_set_color_header"
+        android:layout_width="0dp"
+        android:layout_height="36dp"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent"/>
+    <LinearLayout
+        android:id="@+id/layout_set_color_r"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/iv_set_color_header">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="R"/>
+        <android.support.v7.widget.AppCompatSeekBar
+            android:id="@+id/sb_set_color_r"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/tv_set_color_r"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="255"/>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/layout_set_color_g"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/layout_set_color_r">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="G"/>
+        <android.support.v7.widget.AppCompatSeekBar
+            android:id="@+id/sb_set_color_g"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/tv_set_color_g"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="255"/>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/layout_set_color_b"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/layout_set_color_g">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="B"/>
+        <android.support.v7.widget.AppCompatSeekBar
+            android:id="@+id/sb_set_color_b"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/tv_set_color_b"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="255"/>
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/layout_set_color_a"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        app:layout_constraintTop_toBottomOf="@+id/layout_set_color_b">
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="A"/>
+        <android.support.v7.widget.AppCompatSeekBar
+            android:id="@+id/sb_set_color_a"
+            android:layout_width="128dp"
+            android:layout_height="wrap_content" />
+        <TextView
+            android:id="@+id/tv_set_color_a"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="20sp"
+            android:text="255"/>
+    </LinearLayout>
+
+</android.support.constraint.ConstraintLayout>

src/main/res/values/dimens.xml

@@ -22,4 +22,6 @@
 
     <dimen name="share_dialog_screenshot_width">144dp</dimen>
     <dimen name="share_dialog_screenshot_height">72dp</dimen>
+
+    <dimen name="popup_view_set_color_height">288dp</dimen>
 </resources>