diff --git a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt index e209070a00..eb977e81ae 100644 --- a/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt +++ b/app/src/main/java/com/gh/base/BaseRichEditorActivity.kt @@ -6,6 +6,7 @@ import android.app.Activity import android.content.ClipboardManager import android.content.Context import android.content.Intent +import android.graphics.Color import android.os.Bundle import android.text.TextUtils import android.view.View @@ -214,6 +215,8 @@ abstract class BaseRichEditorActivity : ToolBarAct mKeyboardHeightProvider = KeyboardHeightProvider(this) mRichEditor.post { mKeyboardHeightProvider?.start() } mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) + mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this)) + mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A")) // 防止个别手机在Js里无法获取粘贴内容 mRichEditor.addJavascriptInterface(OnPasteListener(), "onPasteListener") mRichEditor.addJavascriptInterface(OnCursorChangeListener(), "OnCursorChangeListener") @@ -750,6 +753,8 @@ abstract class BaseRichEditorActivity : ToolBarAct super.onDarkModeChanged() updateStatusBarColor(R.color.background_white, R.color.background_white) mRichEditor.enableForceDark(DarkModeUtils.isDarkModeOn(this)) + mRichEditor.setEditorBackgroundColor(R.color.background_white.toColor(this)) + mRichEditor.setEditorFontColor(if (mIsDarkModeOn) Color.parseColor("#C2C2C2") else Color.parseColor("#4A4A4A")) } companion object { diff --git a/app/src/main/java/com/gh/common/view/RichEditor.java b/app/src/main/java/com/gh/common/view/RichEditor.java index fb0312195a..d2eb43a049 100644 --- a/app/src/main/java/com/gh/common/view/RichEditor.java +++ b/app/src/main/java/com/gh/common/view/RichEditor.java @@ -442,6 +442,11 @@ public class RichEditor extends WebView { exec("javascript:RE.setTextColor('" + hex + "');"); } + public void setEditorFontColor(int color) { + String hex = convertHexColorString(color); + exec("javascript:RE.setBaseTextColor('" + hex + "');"); + } + public void insertPlaceholderImage(String id) { exec("javascript:RE.prepareInsert();"); exec("javascript:RE.insertPlaceholderImage('" + id + "');"); diff --git a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java index 233b698455..81faf9a5c2 100644 --- a/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java +++ b/app/src/main/java/com/gh/gamecenter/ShareGhActivity.java @@ -11,12 +11,12 @@ import android.widget.TextView; import androidx.annotation.NonNull; -import com.gh.gamecenter.common.base.activity.ToolBarActivity; import com.gh.common.util.MessageShareUtils; -import com.gh.gamecenter.common.utils.ExtensionsKt; -import com.gh.gamecenter.core.utils.MtaHelper; import com.gh.common.util.QRCodeUtils; +import com.gh.gamecenter.common.base.activity.ToolBarActivity; +import com.gh.gamecenter.common.utils.ExtensionsKt; import com.gh.gamecenter.common.utils.ShareUtils; +import com.gh.gamecenter.core.utils.MtaHelper; import com.tencent.tauth.Tencent; /** @@ -52,7 +52,7 @@ public class ShareGhActivity extends ToolBarActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - + ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); mGhQrcode = findViewById(R.id.gh_address_qrcode); mGhAddress = findViewById(R.id.gh_address_tv); mContentLl = findViewById(R.id.content_ll); @@ -71,4 +71,10 @@ public class ShareGhActivity extends ToolBarActivity { , getString(R.string.gh_icon_url), "玩手游不用肝的感觉真好" , "绿色安全的手游加速助手", ShareUtils.ShareEntrance.shareGh, ""); } + + @Override + protected void onDarkModeChanged() { + super.onDarkModeChanged(); + ExtensionsKt.updateStatusBarColor(this, R.color.background_white, R.color.background_white); + } } diff --git a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt index 034119dbee..00c03709a2 100644 --- a/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/qa/article/edit/ArticleEditActivity.kt @@ -113,6 +113,7 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb @SuppressLint("ClickableViewAccessibility") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) + updateStatusBarColor(R.color.background_white, R.color.background_white) mBinding = ActivityCommunityArticleEditBinding.bind(mContentView) setToolbarMenu(R.menu.menu_answer_post) mMenuDraft = getMenuItem(R.id.menu_draft) @@ -638,6 +639,11 @@ class ArticleEditActivity : BaseRichEditorActivity(), Keyb override fun getVideoGuideKey(): String = Constants.SP_ARTICLE_VIDEO_GUIDE + override fun onDarkModeChanged() { + super.onDarkModeChanged() + updateStatusBarColor(R.color.background_white, R.color.background_white) + } + companion object { const val SAVE_DRAFTS_INTERVAL_TIME = 15000 const val ARTICLE_DRAFT_REQUEST_CODE = 105 diff --git a/app/src/main/res/layout/activity_share_gh.xml b/app/src/main/res/layout/activity_share_gh.xml index 6d0cbdf326..433fcdb7c9 100644 --- a/app/src/main/res/layout/activity_share_gh.xml +++ b/app/src/main/res/layout/activity_share_gh.xml @@ -2,6 +2,7 @@ @@ -9,13 +10,13 @@ @@ -28,10 +29,11 @@ + android:text="光环助手官网" + android:textColor="@color/text_title" />