diff --git a/VisualNovel/app/src/main/AndroidManifest.xml b/VisualNovel/app/src/main/AndroidManifest.xml index f247fad..225c85e 100644 --- a/VisualNovel/app/src/main/AndroidManifest.xml +++ b/VisualNovel/app/src/main/AndroidManifest.xml @@ -74,6 +74,7 @@ diff --git a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt index caa6357..93796a5 100644 --- a/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt +++ b/VisualNovel/app/src/main/java/com/remax/visualnovel/widget/toolbar/CommonToolbar.kt @@ -10,6 +10,7 @@ import android.widget.ImageView import android.widget.LinearLayout import androidx.annotation.DrawableRes import com.remax.visualnovel.R +import com.remax.visualnovel.widget.uitoken.view.UITokenFrameLayout import com.remax.visualnovel.widget.uitoken.view.UITokenImageView import com.remax.visualnovel.widget.uitoken.view.UITokenLinearLayout import com.remax.visualnovel.widget.uitoken.view.UITokenTextView @@ -18,7 +19,7 @@ class CommonToolbar @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : LinearLayout(context, attrs, defStyleAttr) { +) : UITokenFrameLayout(context, attrs, defStyleAttr) { private val ivBack: UITokenImageView private val llCenter: UITokenLinearLayout @@ -29,7 +30,7 @@ class CommonToolbar @JvmOverloads constructor( private var onChildClickListener: ((View) -> Unit)? = null init { - LayoutInflater.from(context).inflate(R.layout.base_toolbar_layout, this, true) + LayoutInflater.from(context).inflate(R.layout.common_toolbar_layout, this, true) ivBack = findViewById(R.id.iv_left) llCenter = findViewById(R.id.ll_center) ivTitle = findViewById(R.id.iv_title) 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 d5a4031..f3777f8 100644 --- a/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml +++ b/VisualNovel/app/src/main/res/layout/activity_actor_chat.xml @@ -23,6 +23,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" /> + diff --git a/VisualNovel/app/src/main/res/values/styles.xml b/VisualNovel/app/src/main/res/values/styles.xml index 2f0a592..8076c4a 100644 --- a/VisualNovel/app/src/main/res/values/styles.xml +++ b/VisualNovel/app/src/main/res/values/styles.xml @@ -6,8 +6,6 @@ @color/glo_color_grey_100 @color/glo_color_magenta_50 true - @color/transparent - true true