github/cordova-plugin-statusbar
github/cordova-plugin-statusbar
3
0
Fork 0
mirror of https://github.com/apache/cordova-plugin-statusbar.git synced 2025-01-19 01:12:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(android): simplify window & activity (#249)

Browse Source
This commit is contained in:
エリス 2022-10-05 19:01:58 +09:00 committed by GitHub
parent 7e9db215cd
commit d4dcd713f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/android/StatusBar.java
View File

@ -19,13 +19,13 @@
*/ */
package org.apache.cordova.statusbar; package org.apache.cordova.statusbar;
import android.app.Activity;
import android.graphics.Color; import android.graphics.Color;
import android.os.Build; import android.os.Build;
import android.view.View; import android.view.View;
import android.view.Window; import android.view.Window;
import android.view.WindowManager; import android.view.WindowManager;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.WindowCompat; import androidx.core.view.WindowCompat;
import androidx.core.view.WindowInsetsControllerCompat; import androidx.core.view.WindowInsetsControllerCompat;
@ -52,6 +52,9 @@ public class StatusBar extends CordovaPlugin {
private static final String STYLE_DEFAULT = "default"; private static final String STYLE_DEFAULT = "default";
private static final String STYLE_LIGHT_CONTENT = "lightcontent"; private static final String STYLE_LIGHT_CONTENT = "lightcontent";
private AppCompatActivity activity;
private Window window;
/** /**
* Sets the context of the Command. This can then be used to do things like * Sets the context of the Command. This can then be used to do things like
* get file paths associated with the Activity. * get file paths associated with the Activity.
@ -64,10 +67,12 @@ public class StatusBar extends CordovaPlugin {
LOG.v(TAG, "StatusBar: initialization"); LOG.v(TAG, "StatusBar: initialization");
super.initialize(cordova, webView); super.initialize(cordova, webView);
this.cordova.getActivity().runOnUiThread(() -> { activity = this.cordova.getActivity();
window = activity.getWindow();
activity.runOnUiThread(() -> {
// Clear flag FLAG_FORCE_NOT_FULLSCREEN which is set initially // Clear flag FLAG_FORCE_NOT_FULLSCREEN which is set initially
// by the Cordova. // by the Cordova.
Window window = cordova.getActivity().getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN); window.clearFlags(WindowManager.LayoutParams.FLAG_FORCE_NOT_FULLSCREEN);
// Read 'StatusBarOverlaysWebView' from config.xml, default is true. // Read 'StatusBarOverlaysWebView' from config.xml, default is true.
@ -94,8 +99,6 @@ public class StatusBar extends CordovaPlugin {
@Override @Override
public boolean execute(final String action, final CordovaArgs args, final CallbackContext callbackContext) { public boolean execute(final String action, final CordovaArgs args, final CallbackContext callbackContext) {
LOG.v(TAG, "Executing action: " + action); LOG.v(TAG, "Executing action: " + action);
final Activity activity = this.cordova.getActivity();
final Window window = activity.getWindow();
switch (action) { switch (action) {
case ACTION_READY: case ACTION_READY:
@ -175,7 +178,6 @@ public class StatusBar extends CordovaPlugin {
return; return;
} }
final Window window = cordova.getActivity().getWindow();
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); // SDK 19-30 window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); // SDK 19-30
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); // SDK 21 window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS); // SDK 21
window.setStatusBarColor(color); window.setStatusBarColor(color);
@ -196,7 +198,6 @@ public class StatusBar extends CordovaPlugin {
private void setStatusBarStyle(final String style) { private void setStatusBarStyle(final String style) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !style.isEmpty()) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && !style.isEmpty()) {
Window window = cordova.getActivity().getWindow();
View decorView = window.getDecorView(); View decorView = window.getDecorView();
WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, decorView); WindowInsetsControllerCompat windowInsetsControllerCompat = WindowCompat.getInsetsController(window, decorView);