diff --git a/app/build.gradle b/app/build.gradle index 53a9e8ab7e..8ee3896eaa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -295,8 +295,6 @@ dependencies { exclude group: 'com.squareup.okhttp3' }) - implementation "com.gyf.immersionbar:immersionbar:$immersionbar" - implementation project(':libraries:LGLibrary') implementation project(':libraries:MTA') implementation project(':libraries:QQShare') diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index ae44237f73..e2c921774b 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -23,7 +23,6 @@ import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.normal.ToolbarController; import com.gh.gamecenter.packagehelper.PackageViewModel; -import com.gyf.immersionbar.ImmersionBar; import com.lightgame.OnTitleClickListener; import org.greenrobot.eventbus.Subscribe; @@ -63,12 +62,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - ImmersionBar.with(this) - .statusBarColor(R.color.white) - .fitsSystemWindows(true) - .statusBarDarkFont(true) - .init(); -// setStatusBarDarkMode(true, this); + setStatusBarDarkMode(true, this); initToolbar(); if (showDownloadMenu()) { diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index a21616ccbb..f958f3efe0 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -10,11 +10,11 @@ import com.gh.common.exposure.ExposureManager; import com.gh.common.exposure.ExposureTraceUtils; import com.gh.common.exposure.ExposureType; import com.gh.common.util.DataUtils; +import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.gamedetail.GameDetailFragment; -import com.gyf.immersionbar.ImmersionBar; import com.halo.assistant.HaloApp; import static com.gh.common.constant.Constants.GAME_DETAIL_COME_IN; @@ -31,11 +31,7 @@ public class GameDetailActivity extends NormalActivity { super.onCreate(savedInstanceState); DownloadManager.getInstance(this).updateSpeedLimitationReleaseDelay(10); - ImmersionBar.with(this) - .statusBarColor(R.color.tranparent) - .fitsSystemWindows(false) - .init(); -// DisplayUtils.transparentStatusBar(this); + DisplayUtils.transparentStatusBar(this); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index 322027c848..bc2016ef6e 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -17,7 +17,6 @@ import com.gh.gamecenter.eventbus.EBSearch import com.gh.gamecenter.search.SearchDefaultFragment import com.gh.gamecenter.search.SearchGameIndexFragment import com.gh.gamecenter.search.SearchGameResultFragment -import com.gyf.immersionbar.ImmersionBar import com.lightgame.utils.Util_System_Keyboard import com.qq.gdt.action.ActionType import io.reactivex.android.schedulers.AndroidSchedulers @@ -53,11 +52,6 @@ open class SearchActivity : BaseActivity() { @SuppressLint("CheckResult") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - ImmersionBar.with(this) - .statusBarColor(R.color.white) - .fitsSystemWindows(true) - .statusBarDarkFont(true) - .init() val hint = intent.getStringExtra(EntranceUtils.KEY_HINT) val searchImmediately = intent.getBooleanExtra(KEY_SEARCH_IMMEDIATELY, false) diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java index fc401cea79..15c5d0d1cc 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -45,7 +45,6 @@ import com.gh.gamecenter.normal.ToolbarController; import com.gh.gamecenter.personal.PersonalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; -import com.gyf.immersionbar.ImmersionBar; import com.lightgame.utils.Utils; import org.greenrobot.eventbus.Subscribe; @@ -134,11 +133,6 @@ public class WebFragment extends NormalFragment { initMenu(); } else { if (requireActivity() instanceof ToolbarController) { - ImmersionBar.with(this) - .statusBarColor(R.color.tranparent) - .fitsSystemWindows(false) - .statusBarDarkFont(false) - .init(); ((ToolbarController) requireActivity()).hideToolbar(true); closeBtn.setVisibility(View.VISIBLE); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) closeBtn.getLayoutParams(); diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index b6c1a324dd..533d073e7e 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,7 +8,7 @@ #1383EB - @color/background + @color/white @color/text_5d5d5d diff --git a/dependencies.gradle b/dependencies.gradle index 36e80ddca0..d5affe3592 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -102,5 +102,4 @@ ext { romChecker = "1.0.0" oss = "2.9.2" toolargetool = "0.2.1@aar" - immersionbar="3.0.0" } \ No newline at end of file