diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt index 8712d63..e1981a3 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatActivity.kt @@ -30,9 +30,10 @@ import com.remax.visualnovel.extension.launchWithRequest import com.remax.visualnovel.extension.setMargin import com.remax.visualnovel.extension.toast import com.remax.visualnovel.manager.nim.NimManager -import com.remax.visualnovel.ui.chat.call.ChatCallView +import com.remax.visualnovel.ui.chat.customui.ChatCallView import com.remax.visualnovel.ui.chat.setting.model.ChatModelDialog -import com.remax.visualnovel.ui.chat.ui.HoldToTalkDialog +import com.remax.visualnovel.ui.chat.customui.HoldToTalkDialog +import com.remax.visualnovel.ui.chat.customui.InputPanel import com.remax.visualnovel.utils.RecordHelper import com.remax.visualnovel.utils.StatusBarUtil3 import com.remax.visualnovel.utils.setOnKeyboardHeightChangeListener diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/call/ChatCallView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatCallView.kt similarity index 92% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/call/ChatCallView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatCallView.kt index 0065ac7..f1c559f 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/call/ChatCallView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatCallView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.call +package com.remax.visualnovel.ui.chat.customui import android.content.Context import android.util.AttributeSet @@ -6,7 +6,6 @@ import android.view.LayoutInflater import android.widget.LinearLayout import com.remax.visualnovel.databinding.LayoutChatCallViewBinding - class ChatCallView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, @@ -31,7 +30,7 @@ class ChatCallView @JvmOverloads constructor( - private fun setupClickListeners() { + fun setupClickListeners() { with (mBinding) { tvHangUp.setOnClickListener { mEventListener.onExitCall() diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatEditView.kt similarity index 85% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatEditView.kt index a5d89de..b1f169a 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ChatEditView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/ChatEditView.kt @@ -1,12 +1,10 @@ -package com.remax.visualnovel.ui.chat +package com.remax.visualnovel.ui.chat.customui import android.content.Context import android.util.AttributeSet import androidx.appcompat.widget.AppCompatEditText import com.remax.visualnovel.R import com.remax.visualnovel.utils.spannablex.utils.dp -import com.remax.visualnovel.widget.uitoken.view.UITokenEditView - class ChatEditView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : AppCompatEditText(context, attrs, defStyleAttr) { diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/HoldToTalkDialog.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/HoldToTalkDialog.kt similarity index 97% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/HoldToTalkDialog.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/HoldToTalkDialog.kt index 334fdcc..80c2741 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/HoldToTalkDialog.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/HoldToTalkDialog.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.customui import android.content.Context import android.graphics.Point @@ -8,7 +8,6 @@ import com.remax.visualnovel.R import com.remax.visualnovel.databinding.DialogHoldToTalkBinding import com.remax.visualnovel.widget.dialoglib.LBindingDialog - class HoldToTalkDialog(context: Context) : LBindingDialog(context, DialogHoldToTalkBinding::inflate) { @@ -55,4 +54,4 @@ class HoldToTalkDialog(context: Context) : ) } -} +} \ No newline at end of file diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/InputPanel.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/InputPanel.kt similarity index 98% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/InputPanel.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/InputPanel.kt index 5e32a5e..ff8e290 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/InputPanel.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/InputPanel.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat +package com.remax.visualnovel.ui.chat.customui import android.annotation.SuppressLint import android.content.Context @@ -32,7 +32,7 @@ class InputPanel @JvmOverloads constructor(context: Context, attrs: AttributeSet init { binding = inflate(ChatInputpanelBinding::inflate) - binding.run { + with(binding) { chatPopMenu.setMenuList(mutableListOf( PopMenuIconView.MenuItem(R.mipmap.chat_ai_talk) { mEventListener.onEnterShortChat() diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/PopMenuIconView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/PopMenuIconView.kt similarity index 99% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/PopMenuIconView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/PopMenuIconView.kt index ef47ab4..0adc428 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/PopMenuIconView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/customui/PopMenuIconView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat +package com.remax.visualnovel.ui.chat.customui import android.animation.Animator diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/ChatSettingView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/ChatSettingView.kt similarity index 78% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/ChatSettingView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/ChatSettingView.kt index 4499c58..e5c7b25 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/ChatSettingView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/ChatSettingView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.setting.customui import android.content.Context @@ -16,11 +16,11 @@ import com.remax.visualnovel.entity.response.ChatHistory import com.remax.visualnovel.entity.response.ChatMode import com.remax.visualnovel.entity.response.ChatSound import com.remax.visualnovel.extension.showConfirmDialog -import com.remax.visualnovel.ui.chat.ui.expandableSelector.ExpandAiModelSelectView -import com.remax.visualnovel.ui.chat.ui.expandableSelector.ExpandBubbleSelectView -import com.remax.visualnovel.ui.chat.ui.expandableSelector.ExpandChatModeSelectView -import com.remax.visualnovel.ui.chat.ui.expandableSelector.ExpandSoundSelectView -import com.remax.visualnovel.ui.chat.ui.expandableSelector.SelectorItem +import com.remax.visualnovel.ui.chat.setting.customui.expandableSelector.ExpandAiModelSelectView +import com.remax.visualnovel.ui.chat.setting.customui.expandableSelector.ExpandBubbleSelectView +import com.remax.visualnovel.ui.chat.setting.customui.expandableSelector.ExpandChatModeSelectView +import com.remax.visualnovel.ui.chat.setting.customui.expandableSelector.ExpandSoundSelectView +import com.remax.visualnovel.ui.chat.setting.customui.expandableSelector.SelectorItem import com.remax.visualnovel.widget.imageviewer.utils.activity import java.util.Date @@ -28,7 +28,7 @@ class ChatSettingView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private var mBinding = LayoutChatMenuViewBinding.inflate(LayoutInflater.from(context), this, true) @@ -108,19 +108,20 @@ class ChatSettingView @JvmOverloads constructor( setTitleIcon(R.mipmap.setting_ai_model) setItems(items) selectItem(0) - setOnEventListener(object : ExpandAiModelSelectView.IEventListener { - override fun onItemSelected( - position: Int, - item: SelectorItem - ) { - // TODO - - } + setOnEventListener( + object : ExpandAiModelSelectView.IEventListener { + override fun onItemSelected( + position: Int, + item: SelectorItem + ) { + // TODO - + } - override fun onExpanded(isExpanded: Boolean) { - if (isExpanded) - scroll2Position(this@with) - } - }) + override fun onExpanded(isExpanded: Boolean) { + if (isExpanded) + scroll2Position(this@with) + } + }) } } @@ -152,20 +153,21 @@ class ChatSettingView @JvmOverloads constructor( setTitleText(R.string.chat_mode) setItems(items) selectItem(0) - setOnEventListener(object : ExpandChatModeSelectView.IEventListener { - override fun onItemSelected( - position: Int, - item: ChatMode - ) { + setOnEventListener( + object : ExpandChatModeSelectView.IEventListener { + override fun onItemSelected( + position: Int, + item: ChatMode + ) { - } + } - override fun onExpanded(isExpanded: Boolean) { - if (isExpanded) - scroll2Position(this@with) - } + override fun onExpanded(isExpanded: Boolean) { + if (isExpanded) + scroll2Position(this@with) + } - }) + }) } } @@ -214,19 +216,20 @@ class ChatSettingView @JvmOverloads constructor( with(mBinding.soundActorSelector) { setItems(items) - setEventListener(object : ExpandSoundSelectView.IEventListener { - override fun onItemSelected( - position: Int, - item: ChatSound - ) { + setEventListener( + object : ExpandSoundSelectView.IEventListener { + override fun onItemSelected( + position: Int, + item: ChatSound + ) { - } + } - override fun onExpanded(isExpanded: Boolean) { - if (isExpanded) - scroll2Position(this@with) - } - }) + override fun onExpanded(isExpanded: Boolean) { + if (isExpanded) + scroll2Position(this@with) + } + }) } } @@ -265,19 +268,20 @@ class ChatSettingView @JvmOverloads constructor( with(mBinding.bubbleSelectView) { setTitleText(R.string.chat_bubble) setItems(items) - setOnEventListener(object : ExpandBubbleSelectView.IEventListener { - override fun onItemSelected( - position: Int, - item: ChatBubble - ) { + setOnEventListener( + object : ExpandBubbleSelectView.IEventListener { + override fun onItemSelected( + position: Int, + item: ChatBubble + ) { - } + } - override fun onExpanded(isExpanded: Boolean) { - if (isExpanded) - scroll2Position(this@with) - } - }) + override fun onExpanded(isExpanded: Boolean) { + if (isExpanded) + scroll2Position(this@with) + } + }) } } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/FontSetView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/FontSetView.kt similarity index 93% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/FontSetView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/FontSetView.kt index d897307..22c1edf 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/FontSetView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/FontSetView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.setting.customui import android.content.Context import android.util.AttributeSet @@ -11,7 +11,7 @@ class FontSetView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { companion object { private const val GAP = 2 diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/LevelSeekbar.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/LevelSeekbar.kt similarity index 98% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/LevelSeekbar.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/LevelSeekbar.kt index 459b592..df5aa8a 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/LevelSeekbar.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/LevelSeekbar.kt @@ -1,11 +1,10 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.setting.customui import android.content.Context import android.graphics.* import android.util.AttributeSet import android.view.MotionEvent -import android.view.View import com.remax.visualnovel.R import com.remax.visualnovel.utils.ResUtil import com.remax.visualnovel.utils.spannablex.utils.dp @@ -17,7 +16,7 @@ class LevelSeekBar @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : View(context, attrs, defStyleAttr) { +) : android.view.View(context, attrs, defStyleAttr) { private var mTotalLevel = 5 private var mCurLevel = 2 diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MaxNumView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MaxNumView.kt similarity index 93% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MaxNumView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MaxNumView.kt index d138a5c..adfbe4a 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MaxNumView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MaxNumView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.setting.customui import android.content.Context import android.util.AttributeSet @@ -10,7 +10,7 @@ class MaxNumView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private val mFixedValueList = intArrayOf(200, 400, 600, 1200, 2400) private var mCurIndex: Int = mFixedValueList.size / 2 diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MyScrollView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MyScrollView.kt similarity index 83% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MyScrollView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MyScrollView.kt index cb423d6..2a84ecf 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MyScrollView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/MyScrollView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui +package com.remax.visualnovel.ui.chat.setting.customui import android.content.Context import android.util.AttributeSet @@ -17,9 +17,6 @@ class MyScrollView @JvmOverloads constructor( child.getDrawingRect(tempRect) offsetDescendantRectToMyCoords(child, tempRect) val scrollDelta: Int = computeScrollDeltaToGetChildRectOnScreen(tempRect) - /*if (scrollDelta != 0) { - scrollBy(0, scrollDelta) - }*/ smoothScrollTo(0, tempRect.top) } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandAiModelSelectView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandAiModelSelectView.kt similarity index 96% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandAiModelSelectView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandAiModelSelectView.kt index 130893b..c3f0b42 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandAiModelSelectView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandAiModelSelectView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -21,7 +21,7 @@ class ExpandAiModelSelectView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var mBinding: LayoutExpandSelectViewBinding @@ -181,7 +181,7 @@ class ExpandAiModelSelectView @JvmOverloads constructor( params.height = value mBinding.itemsContainer.layoutParams = params } - animator.addListener(object : AnimatorListenerAdapter() { + animator.addListener(object : android.animation.AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { mBinding.itemsContainer.visibility = View.GONE } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBackgroundSubView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBackgroundSubView.kt similarity index 94% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBackgroundSubView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBackgroundSubView.kt index dff822c..2ca8941 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBackgroundSubView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBackgroundSubView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.annotation.SuppressLint import android.content.Context @@ -17,13 +17,12 @@ import com.remax.visualnovel.R import com.remax.visualnovel.databinding.LayoutItemSettingBackgroundBinding import com.remax.visualnovel.databinding.LayoutSettingBgSubViewBinding import com.remax.visualnovel.entity.response.ChatBackground -import com.remax.visualnovel.extension.glide.load class ExpandBackgroundSubView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var items: List private var mBinding: LayoutSettingBgSubViewBinding diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSelectView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSelectView.kt similarity index 95% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSelectView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSelectView.kt index 732ed25..9059d17 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSelectView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSelectView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -12,14 +12,13 @@ import android.widget.LinearLayout import com.remax.visualnovel.R import com.remax.visualnovel.databinding.LayoutExpandSelectViewBinding import com.remax.visualnovel.entity.response.ChatBubble -import com.remax.visualnovel.entity.response.ChatSound class ExpandBubbleSelectView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var mBinding: LayoutExpandSelectViewBinding private lateinit var mExpandSubView : ExpandBubbleSubView @@ -110,7 +109,7 @@ class ExpandBubbleSelectView @JvmOverloads constructor( params.height = value mBinding.itemsContainer.layoutParams = params } - animator.addListener(object : AnimatorListenerAdapter() { + animator.addListener(object : android.animation.AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { mBinding.itemsContainer.visibility = GONE } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSubView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSubView.kt similarity index 92% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSubView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSubView.kt index e942ec7..fc6a607 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandBubbleSubView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandBubbleSubView.kt @@ -1,10 +1,9 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater import android.widget.LinearLayout -import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView import com.drake.brv.annotaion.DividerOrientation import com.drake.brv.utils.bindingAdapter @@ -16,14 +15,13 @@ import com.remax.visualnovel.R import com.remax.visualnovel.databinding.LayoutItemSettingBubbleBinding import com.remax.visualnovel.databinding.LayoutSettingBubbleSubViewBinding import com.remax.visualnovel.entity.response.ChatBubble -import com.remax.visualnovel.extension.glide.load class ExpandBubbleSubView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var items: List private var mBinding: LayoutSettingBubbleSubViewBinding diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandChatModeSelectView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandChatModeSelectView.kt similarity index 96% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandChatModeSelectView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandChatModeSelectView.kt index b063c0b..b237123 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandChatModeSelectView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandChatModeSelectView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.animation.Animator import android.animation.AnimatorListenerAdapter @@ -22,7 +22,7 @@ class ExpandChatModeSelectView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var mBinding: LayoutExpandSelectViewBinding @@ -176,7 +176,7 @@ class ExpandChatModeSelectView @JvmOverloads constructor( params.height = value mBinding.itemsContainer.layoutParams = params } - animator.addListener(object : AnimatorListenerAdapter() { + animator.addListener(object : android.animation.AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { mBinding.itemsContainer.visibility = GONE } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandHistorySubView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandHistorySubView.kt similarity index 94% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandHistorySubView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandHistorySubView.kt index 416ff93..c7c2e04 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandHistorySubView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandHistorySubView.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.content.Context import android.util.AttributeSet @@ -8,7 +8,6 @@ import androidx.recyclerview.widget.RecyclerView import com.drake.brv.annotaion.DividerOrientation import com.drake.brv.utils.bindingAdapter import com.drake.brv.utils.divider -import com.drake.brv.utils.grid import com.drake.brv.utils.linear import com.drake.brv.utils.models import com.drake.brv.utils.setup @@ -24,7 +23,7 @@ class ExpandHistorySubView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var items: List private var mBinding: LayoutSettingBgSubViewBinding diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSelectView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSelectView.kt similarity index 95% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSelectView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSelectView.kt index 4cbe1e5..f9555d9 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSelectView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSelectView.kt @@ -1,7 +1,7 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector + import android.animation.Animator -import android.animation.AnimatorListenerAdapter import android.animation.ObjectAnimator import android.animation.ValueAnimator import android.content.Context @@ -15,12 +15,11 @@ import com.remax.visualnovel.databinding.LayoutExpandSelectViewBinding import com.remax.visualnovel.entity.response.ChatSound - class ExpandSoundSelectView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var mBinding: LayoutExpandSelectViewBinding private lateinit var mExpandView : ExpandSoundSubView private var isExpanded = false @@ -121,7 +120,7 @@ class ExpandSoundSelectView @JvmOverloads constructor( params.height = value mBinding.itemsContainer.layoutParams = params } - animator.addListener(object : AnimatorListenerAdapter() { + animator.addListener(object : android.animation.AnimatorListenerAdapter() { override fun onAnimationEnd(animation: Animator) { mBinding.itemsContainer.visibility = View.GONE } diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSubView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSubView.kt similarity index 96% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSubView.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSubView.kt index 5a36360..4a2d3ad 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSoundSubView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/ExpandSoundSubView.kt @@ -1,9 +1,8 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector import android.content.Context import android.util.AttributeSet import android.view.LayoutInflater -import android.widget.LinearLayout import androidx.recyclerview.widget.RecyclerView import com.drake.brv.annotaion.DividerOrientation import com.drake.brv.utils.bindingAdapter @@ -27,7 +26,7 @@ class ExpandSoundSubView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : android.widget.LinearLayout(context, attrs, defStyleAttr) { private lateinit var items: List private var mBinding: LayoutSettingSoundSubViewBinding diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/SelctorItem.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/SelctorItem.kt similarity index 73% rename from VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/SelctorItem.kt rename to VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/SelctorItem.kt index c6b8eee..ba5812d 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/SelctorItem.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/setting/customui/expandableSelector/SelctorItem.kt @@ -1,4 +1,4 @@ -package com.remax.visualnovel.ui.chat.ui.expandableSelector +package com.remax.visualnovel.ui.chat.setting.customui.expandableSelector data class SelectorItem( val name: String, diff --git a/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml b/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml index d8e2001..a8e0c3b 100644 --- a/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml +++ b/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml @@ -53,7 +53,7 @@ app:layout_constraintBottom_toTopOf="@+id/input_panel" /> - - - - - - - + + + diff --git a/VisualNovel/app/src/main/res/layout/layout_chat_menu_view.xml b/VisualNovel/app/src/main/res/layout/layout_chat_menu_view.xml index 775bd5d..043ec9c 100644 --- a/VisualNovel/app/src/main/res/layout/layout_chat_menu_view.xml +++ b/VisualNovel/app/src/main/res/layout/layout_chat_menu_view.xml @@ -44,7 +44,7 @@ - - - - - - - - - - + \ No newline at end of file diff --git a/VisualNovel/app/src/main/res/layout/layout_expand_sound_select_view.xml b/VisualNovel/app/src/main/res/layout/layout_expand_sound_select_view.xml index b7048a6..2bc0744 100644 --- a/VisualNovel/app/src/main/res/layout/layout_expand_sound_select_view.xml +++ b/VisualNovel/app/src/main/res/layout/layout_expand_sound_select_view.xml @@ -51,7 +51,7 @@ android:orientation="vertical" android:layout_marginTop="@dimen/dp_2" android:visibility="gone"> - -