Extract TOGGLE_START_MENU string to TaskbarIntent.ACTION_TOGGLE_START_MENU

Signed-off-by: utzcoz <utzcoz@outlook.com>

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index c293fa9..3aba1c9 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -776,9 +776,11 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
         MenuHelper.getInstance().setContextMenuOpen(false);
 
         if(!dashboardOrStartMenuAppearing) {
-            if(showStartMenu)
-                LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TOGGLE_START_MENU"));
-            else {
+            if (showStartMenu) {
+                LocalBroadcastManager
+                        .getInstance(this)
+                        .sendBroadcast(new Intent(TaskbarIntent.ACTION_TOGGLE_START_MENU));
+            } else {
                 LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.RESET_START_MENU"));
 
                 if(shouldHideTaskbar && U.shouldCollapse(this, true)) {

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
index a33392f..f491152 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/KeyboardShortcutActivity.java
@@ -24,6 +24,7 @@ import android.os.Build;
 import android.os.Bundle;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.service.StartMenuService;
 import com.farmerbb.taskbar.util.FreeformHackHelper;
 import com.farmerbb.taskbar.util.U;
@@ -64,8 +65,10 @@ public class KeyboardShortcutActivity extends Activity {
 
                 break;
             case Intent.ACTION_ASSIST:
-                if(U.isServiceRunning(this, StartMenuService.class)) {
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.TOGGLE_START_MENU"));
+                if (U.isServiceRunning(this, StartMenuService.class)) {
+                    LocalBroadcastManager
+                            .getInstance(this)
+                            .sendBroadcast(new Intent(TaskbarIntent.ACTION_TOGGLE_START_MENU));
                 } else {
                     Intent intent = new Intent("com.google.android.googlequicksearchbox.TEXT_ASSIST");
                     if(intent.resolveActivity(getPackageManager()) == null)

diff --git a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
index f1d2cb0..6a29ede 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
+++ b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
@@ -3,4 +3,5 @@ package com.farmerbb.taskbar.content;
 public class TaskbarIntent {
     public static final String ACTION_HIDE_TASKBAR = "com.farmerbb.taskbar.HIDE_TASKBAR";
     public static final String ACTION_HIDE_START_MENU = "com.farmerbb.taskbar.HIDE_START_MENU";
+    public static final String ACTION_TOGGLE_START_MENU = "com.farmerbb.taskbar.TOGGLE_START_MENU";
 }

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java b/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
index 3d6a0fc..0173734 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
@@ -424,7 +424,10 @@ public class StartMenuController implements UIController {
         lbm.unregisterReceiver(hideSpaceReceiver);
         lbm.unregisterReceiver(resetReceiver);
 
-        lbm.registerReceiver(toggleReceiver, new IntentFilter("com.farmerbb.taskbar.TOGGLE_START_MENU"));
+        lbm.registerReceiver(
+                toggleReceiver,
+                new IntentFilter(TaskbarIntent.ACTION_TOGGLE_START_MENU)
+        );
         lbm.registerReceiver(
                 hideReceiver,
                 new IntentFilter(TaskbarIntent.ACTION_HIDE_START_MENU)

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
index 1d045c2..03aa284 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
@@ -154,7 +154,7 @@ public class TaskbarController implements UIController {
     private int cellStrength = -1;
 
     private View.OnClickListener ocl = view -> {
-        Intent intent = new Intent("com.farmerbb.taskbar.TOGGLE_START_MENU");
+        Intent intent = new Intent(TaskbarIntent.ACTION_TOGGLE_START_MENU);
         LocalBroadcastManager.getInstance(context).sendBroadcast(intent);
     };
 

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
index 16b3829..713bdad 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/TaskerActionReceiver.java
@@ -65,7 +65,7 @@ public final class TaskerActionReceiver extends BroadcastReceiver {
             case "hide_taskbar":
                 return new Intent(TaskbarIntent.ACTION_HIDE_TASKBAR);
             case "toggle_start_menu":
-                return new Intent("com.farmerbb.taskbar.TOGGLE_START_MENU");
+                return new Intent(TaskbarIntent.ACTION_TOGGLE_START_MENU);
             case "toggle_dashboard":
                 return new Intent("com.farmerbb.taskbar.TOGGLE_DASHBOARD");
         }