OSDN Git Service

Extract UPDATE_FREEFORM_CHECKBOX to TaskbarIntent contant
authorutzcoz <utzcoz@outlook.com>
Sat, 21 Mar 2020 06:11:43 +0000 (14:11 +0800)
committerutzcoz <utzcoz@outlook.com>
Sat, 21 Mar 2020 06:11:43 +0000 (14:11 +0800)
Signed-off-by: utzcoz <utzcoz@outlook.com>
app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
app/src/main/java/com/farmerbb/taskbar/activity/ShortcutActivity.java
app/src/main/java/com/farmerbb/taskbar/content/TaskbarIntent.java
app/src/main/java/com/farmerbb/taskbar/fragment/FreeformModeFragment.java
app/src/main/java/com/farmerbb/taskbar/receiver/ToggleFreeformModeReceiver.java
app/src/playstore/java/com/farmerbb/taskbar/receiver/DisableFreeformReceiver.java
app/src/playstore/java/com/farmerbb/taskbar/receiver/EnableFreeformReceiver.java

index 350f5db..7c90e2f 100644 (file)
@@ -373,7 +373,7 @@ public class HomeActivityDelegate extends AppCompatActivity implements UIHost {
         lbm.registerReceiver(forceTaskbarStartReceiver, new IntentFilter("com.farmerbb.taskbar.FORCE_TASKBAR_RESTART"));
 
         IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX");
+        intentFilter.addAction(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX);
         intentFilter.addAction("com.farmerbb.taskbar.TOUCH_ABSORBER_STATE_CHANGED");
         intentFilter.addAction("com.farmerbb.taskbar.FREEFORM_PREF_CHANGED");
 
index b3bfa17..3827d53 100644 (file)
@@ -23,6 +23,7 @@ import android.os.Handler;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.farmerbb.taskbar.R;
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.ShortcutUtils;
 import com.farmerbb.taskbar.util.U;
 
@@ -40,7 +41,9 @@ public class ShortcutActivity extends Activity {
                 if(!pref.getBoolean("freeform_hack", false)) {
                     pref.edit().putBoolean("freeform_hack", true).apply();
 
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(new Intent("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+                    LocalBroadcastManager
+                            .getInstance(this)
+                            .sendBroadcast(new Intent(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX));
                 }
 
                 Intent intent = new Intent("com.farmerbb.taskbar.START");
index 3053df9..cb297a7 100644 (file)
@@ -17,7 +17,9 @@ package com.farmerbb.taskbar.content;
 
 public class TaskbarIntent {
 
-    private TaskbarIntent() {}
+    private TaskbarIntent() {
+        // Empty constructor
+    }
 
     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";
@@ -33,4 +35,6 @@ public class TaskbarIntent {
             "com.farmerbb.taskbar.SHOW_START_MENU_SPACE";
     public static final String ACTION_HIDE_START_MENU_SPACE =
             "com.farmerbb.taskbar.HIDE_START_MENU_SPACE";
+    public static final String ACTION_UPDATE_FREEFORM_CHECKBOX =
+            "com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX";
 }
index e2d5eaf..fc81ca2 100644 (file)
@@ -35,6 +35,7 @@ import android.view.View;
 import android.widget.Toast;
 
 import com.farmerbb.taskbar.R;
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.FreeformHackHelper;
 import com.farmerbb.taskbar.util.U;
 
@@ -100,7 +101,12 @@ public class FreeformModeFragment extends SettingsFragment {
             dialog.setCancelable(false);
         }
 
-        LocalBroadcastManager.getInstance(getActivity()).registerReceiver(checkBoxReceiver, new IntentFilter("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+        LocalBroadcastManager
+                .getInstance(getActivity())
+                .registerReceiver(
+                        checkBoxReceiver,
+                        new IntentFilter(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX)
+                );
 
         finishedLoadingPrefs = true;
     }
index 5945094..92e26ad 100644 (file)
@@ -23,6 +23,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.activity.DummyActivity;
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.service.NotificationService;
 import com.farmerbb.taskbar.util.U;
 
@@ -43,7 +44,9 @@ public class ToggleFreeformModeReceiver extends BroadcastReceiver {
             U.startForegroundService(context, notificationIntent);
 
             U.stopFreeformHack(context);
-            LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+            LocalBroadcastManager
+                    .getInstance(context)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX));
         } else if(U.hasFreeformSupport(context)) {
             pref.edit().putBoolean("freeform_hack", true).apply();
 
@@ -57,7 +60,9 @@ public class ToggleFreeformModeReceiver extends BroadcastReceiver {
 
             U.startForegroundService(context, notificationIntent);
 
-            LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+            LocalBroadcastManager
+                    .getInstance(context)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX));
         } else
             U.showToastLong(context, R.string.tb_no_freeform_support);
     }
index 145d68d..654ec6c 100644 (file)
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.U;
 
 public class DisableFreeformReceiver extends BroadcastReceiver {
@@ -36,7 +37,9 @@ public class DisableFreeformReceiver extends BroadcastReceiver {
 
             pref.edit().putBoolean("freeform_hack", false).apply();
 
-            LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+            LocalBroadcastManager
+                    .getInstance(context)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX));
         }
     }
 }
\ No newline at end of file
index 187c59a..85d5408 100644 (file)
@@ -21,6 +21,7 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
+import com.farmerbb.taskbar.content.TaskbarIntent;
 import com.farmerbb.taskbar.util.U;
 
 public class EnableFreeformReceiver extends BroadcastReceiver {
@@ -36,7 +37,9 @@ public class EnableFreeformReceiver extends BroadcastReceiver {
 
             pref.edit().putBoolean("freeform_hack", true).apply();
 
-            LocalBroadcastManager.getInstance(context).sendBroadcast(new Intent("com.farmerbb.taskbar.UPDATE_FREEFORM_CHECKBOX"));
+            LocalBroadcastManager
+                    .getInstance(context)
+                    .sendBroadcast(new Intent(TaskbarIntent.ACTION_UPDATE_FREEFORM_CHECKBOX));
         }
     }
 }
\ No newline at end of file