Extract FINISH_FREEFORM_ACTIVITY to TaskbarIntent constant

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

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
index 21b49bf..5f51a8d 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/InvisibleActivityFreeform.java
@@ -120,7 +120,12 @@ public class InvisibleActivityFreeform extends Activity {
 
         LocalBroadcastManager.getInstance(this).registerReceiver(appearingReceiver, appearingReceiverFilter);
         LocalBroadcastManager.getInstance(this).registerReceiver(disappearingReceiver, disappearingReceiverFilter);
-        LocalBroadcastManager.getInstance(this).registerReceiver(finishReceiver, new IntentFilter("com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY"));
+        LocalBroadcastManager
+                .getInstance(this)
+                .registerReceiver(
+                        finishReceiver,
+                        new IntentFilter(TaskbarIntent.ACTION_FINISH_FREEFORM_ACTIVITY)
+                );
 
         helper.setFreeformHackActive(true);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/TouchAbsorberActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/TouchAbsorberActivity.java
index 7e375f6..ec74989 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/TouchAbsorberActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/TouchAbsorberActivity.java
@@ -31,6 +31,7 @@ import android.widget.LinearLayout;
 
 import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.R;
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.DisplayInfo;
 import com.farmerbb.taskbar.util.FreeformHackHelper;
 import com.farmerbb.taskbar.util.U;
@@ -59,7 +60,10 @@ public class TouchAbsorberActivity extends Activity {
         if(BuildConfig.DEBUG) layout.setBackgroundColor(0x800000FF);
 
         LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(this);
-        lbm.registerReceiver(finishReceiver, new IntentFilter("com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY"));
+        lbm.registerReceiver(
+                finishReceiver,
+                new IntentFilter(TaskbarIntent.ACTION_FINISH_FREEFORM_ACTIVITY)
+        );
 
         FreeformHackHelper.getInstance().setTouchAbsorberActive(true);
         lbm.sendBroadcast(new Intent("com.farmerbb.taskbar.TOUCH_ABSORBER_STATE_CHANGED"));

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 cb297a7..676bdf3 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
+++ b/app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
@@ -37,4 +37,6 @@ public class TaskbarIntent {
             "com.farmerbb.taskbar.HIDE_START_MENU_SPACE";
     public static final String ACTION_UPDATE_FREEFORM_CHECKBOX =
             "com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX";
+    public static final String ACTION_FINISH_FREEFORM_ACTIVITY =
+            "com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY";
 }

diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
index 1ae71fc..912542b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/SettingsFragment.java
@@ -33,6 +33,7 @@ import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.activity.ClearDataActivity;
 import com.farmerbb.taskbar.activity.MainActivity;
 import com.farmerbb.taskbar.activity.dark.ClearDataActivityDark;
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.FreeformHackHelper;
 import com.farmerbb.taskbar.util.U;
 
@@ -103,7 +104,13 @@ public abstract class SettingsFragment extends PreferenceFragment implements Pre
                         helper.setFreeformHackActive(false);
                         helper.setInFreeformWorkspace(false);
 
-                        LocalBroadcastManager.getInstance(getActivity()).sendBroadcast(new Intent("com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY"));
+                        LocalBroadcastManager
+                                .getInstance(getActivity())
+                                .sendBroadcast(
+                                        new Intent(
+                                                TaskbarIntent.ACTION_FINISH_FREEFORM_ACTIVITY
+                                        )
+                                );
 
                         SharedPreferences pref = U.getSharedPreferences(getActivity());
                         if(pref.getBoolean("taskbar_active", false) && !pref.getBoolean("is_hidden", false))

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 0238776..7bda5ff 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
@@ -627,7 +627,7 @@ public class TaskbarController implements UIController {
             U.showHideNavigationBar(context, false);
 
         if(FreeformHackHelper.getInstance().isTouchAbsorberActive()) {
-            lbm.sendBroadcast(new Intent("com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY"));
+            lbm.sendBroadcast(new Intent(TaskbarIntent.ACTION_FINISH_FREEFORM_ACTIVITY));
 
             new Handler().postDelayed(() -> U.startTouchAbsorberActivity(context), 500);
         }

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 8b4865e..5f316fa 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -400,7 +400,9 @@ public class U {
     }
 
     public static void stopFreeformHack(Context context) {
-        LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.FINISH_FREEFORM_ACTIVITY"));
+        LocalBroadcastManager
+                .getInstance(context)
+                .sendBroadcast(new Intent(TaskbarIntent.ACTION_FINISH_FREEFORM_ACTIVITY));
 
         if(isOverridingFreeformHack(context, false)) {
             FreeformHackHelper helper = FreeformHackHelper.getInstance();