From a36a8315cbea029156828e72db962ed1ea70a2e1 Mon Sep 17 00:00:00 2001 From: HuanChengFly <609486518@qq.com> Date: Wed, 17 Feb 2021 22:05:27 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E5=8F=91=E5=B8=83=20Dev=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tieba/post/widgets/MyToolbar.kt | 50 ------------------- application.properties | 2 +- 2 files changed, 1 insertion(+), 51 deletions(-) delete mode 100644 app/src/main/java/com/huanchengfly/tieba/post/widgets/MyToolbar.kt diff --git a/app/src/main/java/com/huanchengfly/tieba/post/widgets/MyToolbar.kt b/app/src/main/java/com/huanchengfly/tieba/post/widgets/MyToolbar.kt deleted file mode 100644 index 627d9b07..00000000 --- a/app/src/main/java/com/huanchengfly/tieba/post/widgets/MyToolbar.kt +++ /dev/null @@ -1,50 +0,0 @@ -package com.huanchengfly.tieba.post.widgets - -import android.content.Context -import android.graphics.drawable.Drawable -import android.util.AttributeSet -import android.view.Gravity -import android.widget.ImageButton -import androidx.appcompat.widget.Toolbar -import com.huanchengfly.tieba.post.R -import com.huanchengfly.tieba.post.widgets.theme.TintToolbar - -class MyToolbar @JvmOverloads constructor( - context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 -) : TintToolbar(context, attrs, defStyleAttr) { - var navigationButtonGravity = Gravity.TOP - - init { - if (attrs != null) { - val array = getContext().obtainStyledAttributes(attrs, R.styleable.MyToolbar, defStyleAttr, 0) - navigationButtonGravity = array.getInteger(R.styleable.MyToolbar_navigationButtonGravity, Gravity.TOP) - array.recycle() - } - } - - override fun setNavigationIcon(icon: Drawable?) { - super.setNavigationIcon(icon) - ensureNavButtonView() - } - - override fun setNavigationContentDescription(description: CharSequence?) { - super.setNavigationContentDescription(description) - ensureNavButtonView() - } - - override fun setNavigationOnClickListener(listener: OnClickListener?) { - super.setNavigationOnClickListener(listener) - ensureNavButtonView() - } - - private fun ensureNavButtonView() { - try { - val navButtonViewField = Toolbar::class.java.getDeclaredField("mNavButtonView") - navButtonViewField.isAccessible = true - val navButtonView = navButtonViewField.get(this) as ImageButton - (navButtonView.layoutParams as LayoutParams).gravity = Gravity.START or (navigationButtonGravity and Gravity.VERTICAL_GRAVITY_MASK) - } catch (e: Exception) { - e.printStackTrace() - } - } -} \ No newline at end of file diff --git a/application.properties b/application.properties index 848b6982..f112b7a7 100644 --- a/application.properties +++ b/application.properties @@ -2,4 +2,4 @@ versionCode=38300 versionName=4.0.0 isPerRelease=true preReleaseName=dev -preReleaseVer=2 \ No newline at end of file +preReleaseVer=3 \ No newline at end of file