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/ui/FontSetView.kt new file mode 100644 index 0000000..88477da --- /dev/null +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/FontSetView.kt @@ -0,0 +1,50 @@ +package com.remax.visualnovel.ui.chat.ui + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import com.remax.visualnovel.databinding.LayoutFontSetViewBinding + + +class FontSetView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + companion object { + private var GAP = 1 + } + + private var mBinding: LayoutFontSetViewBinding + + private var mFontValue = 20 + + init { + mBinding = LayoutFontSetViewBinding.inflate(LayoutInflater.from(context), this, true) + setupClickListeners() + } + + + + + private fun setupClickListeners() { + with (mBinding) { + ivFontPlus.setOnClickListener { + mFontValue -= GAP + tvFontValue.text = mFontValue.toString() + } + + ivFontAdd.setOnClickListener { + mFontValue += GAP + tvFontValue.text = mFontValue.toString() + } + + } + } + + + + +} \ No newline at end of file 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/ui/MaxNumView.kt new file mode 100644 index 0000000..0847306 --- /dev/null +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/MaxNumView.kt @@ -0,0 +1,88 @@ +package com.remax.visualnovel.ui.chat.ui + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.LinearLayout +import com.remax.visualnovel.databinding.LayoutMaxNumViewBinding + +class MaxNumView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : LinearLayout(context, attrs, defStyleAttr) { + + companion object { + private var GAP = 100 + } + + private var mBinding: LayoutMaxNumViewBinding + + private var mCurNum = 2500 + + init { + mBinding = LayoutMaxNumViewBinding.inflate(LayoutInflater.from(context), this, true) + setupClickListeners() + } + + + + + private fun setupClickListeners() { + with (mBinding) { + ivLeftIcon.setOnClickListener { + mCurNum -= GAP + tvCenter.text = mCurNum.toString() + } + + ivRightIcon.setOnClickListener { + mCurNum += GAP + tvCenter.text = mCurNum.toString() + } + + } + } + + + + /*override fun onTouchEvent(event: MotionEvent): Boolean { + when (event.action) { + MotionEvent.ACTION_DOWN -> { + val x = event.x + val y = event.y + + if (mBinding..contains(x, y)) { + isLeftPressed = true + startLongPress(false) // 减小 + return true + } else if (rightArrowRect.contains(x, y)) { + isRightPressed = true + startLongPress(true) // 增大 + return true + } + } + + MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> { + stopLongPress() + } + + MotionEvent.ACTION_MOVE -> { + val x = event.x + val y = event.y + + // 如果手指移出按钮区域,停止长按 + if (!leftArrowRect.contains(x, y) && isLeftPressed) { + stopLongPress() + } + if (!rightArrowRect.contains(x, y) && isRightPressed) { + stopLongPress() + } + } + } + + invalidate() + return super.onTouchEvent(event) + }*/ + + +} \ No newline at end of file diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSelectView.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSelectView.kt index 9b30504..64998fc 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSelectView.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/ui/chat/ui/expandableSelector/ExpandSelectView.kt @@ -36,6 +36,7 @@ class ExpandSelectView @JvmOverloads constructor( private fun initView(context: Context, attrs: AttributeSet?) { mBinding = LayoutExpandSelectViewBinding.inflate(LayoutInflater.from(context), this, true) + mBinding.itemsContainer.setBackgroundResource(R.drawable.bg_expand_view_items) setupAttributes(attrs) setupClickListeners() } 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 3b0c932..48623c3 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 @@ -193,8 +193,11 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="10dp" > - - + @@ -213,6 +216,11 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="10dp" > + diff --git a/VisualNovel/app/src/main/res/layout/layout_expand_select_view.xml b/VisualNovel/app/src/main/res/layout/layout_expand_select_view.xml index 6b0de7f..c22d5b3 100644 --- a/VisualNovel/app/src/main/res/layout/layout_expand_select_view.xml +++ b/VisualNovel/app/src/main/res/layout/layout_expand_select_view.xml @@ -47,7 +47,6 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginTop="@dimen/dp_2" - android:background="@drawable/bg_expand_view_items" android:visibility="gone"/> \ No newline at end of file diff --git a/VisualNovel/app/src/main/res/layout/layout_font_set_view.xml b/VisualNovel/app/src/main/res/layout/layout_font_set_view.xml new file mode 100644 index 0000000..f1d1893 --- /dev/null +++ b/VisualNovel/app/src/main/res/layout/layout_font_set_view.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VisualNovel/app/src/main/res/layout/layout_max_num_view.xml b/VisualNovel/app/src/main/res/layout/layout_max_num_view.xml index 6b0de7f..e4a7284 100644 --- a/VisualNovel/app/src/main/res/layout/layout_max_num_view.xml +++ b/VisualNovel/app/src/main/res/layout/layout_max_num_view.xml @@ -1,53 +1,43 @@ - + app:backgroundColorToken="@string/color_chat_setting_item_bg" + app:radiusToken="@string/radius_m" + android:paddingVertical="@dimen/dp_12" + android:paddingHorizontal="@dimen/dp_17" + > - + + + android:layout_toEndOf="@id/iv_left_icon" + android:layout_toStartOf="@+id/iv_right_icon" + android:layout_centerVertical="true" + android:textSize="@dimen/sp_14" + android:textColor="@color/gray6" + android:gravity="center" + android:textStyle="bold" + android:text="2500" + /> - + - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_left.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_left.webp new file mode 100644 index 0000000..549f0c8 Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_left.webp differ diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_right.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_right.webp new file mode 100644 index 0000000..e16f4c8 Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/num_setting_right.webp differ diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_add.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_add.webp new file mode 100644 index 0000000..ed2a311 Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_add.webp differ diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_icon.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_icon.webp new file mode 100644 index 0000000..fa21373 Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_icon.webp differ diff --git a/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_plus.webp b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_plus.webp new file mode 100644 index 0000000..841f2e0 Binary files /dev/null and b/VisualNovel/app/src/main/res/mipmap-xxhdpi/setting_font_plus.webp differ diff --git a/VisualNovel/app/src/main/res/values/strings.xml b/VisualNovel/app/src/main/res/values/strings.xml index b34a6a7..2f0b91b 100644 --- a/VisualNovel/app/src/main/res/values/strings.xml +++ b/VisualNovel/app/src/main/res/values/strings.xml @@ -479,5 +479,6 @@ Short Text Mode Play dialogue only Maximum number of response tokens + Font Size \ No newline at end of file