Fix quick settings tile bug + more code cleanup

diff --git a/app/src/nonlib/java/com/farmerbb/taskbar/activity/PersistentShortcutSelectAppActivity.java b/app/src/nonlib/java/com/farmerbb/taskbar/activity/PersistentShortcutSelectAppActivity.java
index 8905827..40a586e 100644 (file)
--- a/app/src/nonlib/java/com/farmerbb/taskbar/activity/PersistentShortcutSelectAppActivity.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/activity/PersistentShortcutSelectAppActivity.java
@@ -36,7 +36,6 @@ import android.widget.Spinner;
 
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.util.AppEntry;
-import com.farmerbb.taskbar.util.Constants;
 import com.farmerbb.taskbar.util.U;
 
 import static com.farmerbb.taskbar.util.Constants.*;

diff --git a/app/src/nonlib/java/com/farmerbb/taskbar/service/FavoriteAppTileService.java b/app/src/nonlib/java/com/farmerbb/taskbar/service/FavoriteAppTileService.java
index 6f31b2c..1af6d3e 100644 (file)
--- a/app/src/nonlib/java/com/farmerbb/taskbar/service/FavoriteAppTileService.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/service/FavoriteAppTileService.java
@@ -34,27 +34,17 @@ import androidx.annotation.VisibleForTesting;
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.activity.PersistentShortcutLaunchActivity;
 import com.farmerbb.taskbar.activity.PersistentShortcutSelectAppActivity;
-import com.farmerbb.taskbar.util.Constants;
 import com.farmerbb.taskbar.util.IconCache;
 import com.farmerbb.taskbar.util.U;
 
-import static com.farmerbb.taskbar.util.Constants.EXTRA_COMPONENT_NAME;
-import static com.farmerbb.taskbar.util.Constants.EXTRA_PACKAGE_NAME;
-import static com.farmerbb.taskbar.util.Constants.EXTRA_USER_ID;
-import static com.farmerbb.taskbar.util.Constants.EXTRA_WINDOW_SIZE;
-import static com.farmerbb.taskbar.util.Constants.PREF_COMPONENT_NAME_SUFFIX;
-import static com.farmerbb.taskbar.util.Constants.PREF_ICON_THRESHOLD_SUFFIX;
-import static com.farmerbb.taskbar.util.Constants.PREF_LABEL_SUFFIX;
-import static com.farmerbb.taskbar.util.Constants.PREF_PACKAGE_NAME_SUFFIX;
-import static com.farmerbb.taskbar.util.Constants.PREF_USER_ID_SUFFIX;
-import static com.farmerbb.taskbar.util.Constants.PREF_WINDOW_SIZE_SUFFIX;
+import static com.farmerbb.taskbar.util.Constants.*;
 
 @TargetApi(Build.VERSION_CODES.N)
 public abstract class FavoriteAppTileService extends TileService {
 
     protected abstract int tileNumber();
 
-    private String prefix = Constants.PREF_QS_TILE + "_" + tileNumber() + "_";
+    private final String prefix = PREF_QS_TILE + "_" + tileNumber() + "_";
 
     @Override
     public void onStartListening() {
@@ -64,13 +54,13 @@ public abstract class FavoriteAppTileService extends TileService {
     @Override
     public void onTileRemoved() {
         SharedPreferences pref = U.getSharedPreferences(this);
-        pref.edit().putBoolean(prefix + Constants.PREF_ADDED_SUFFIX, false).apply();
+        pref.edit().putBoolean(prefix + PREF_ADDED_SUFFIX, false).apply();
     }
 
     @Override
     public void onClick() {
         SharedPreferences pref = U.getSharedPreferences(this);
-        if(!pref.getBoolean(prefix + Constants.PREF_ADDED_SUFFIX, false)) {
+        if(!pref.getBoolean(prefix + PREF_ADDED_SUFFIX, false)) {
             selectApp();
             return;
         }
@@ -90,7 +80,7 @@ public abstract class FavoriteAppTileService extends TileService {
     private void selectApp() {
         Intent intent = U.getThemedIntent(this, PersistentShortcutSelectAppActivity.class);
         intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-        intent.putExtra(Constants.PREF_QS_TILE, tileNumber());
+        intent.putExtra(PREF_QS_TILE, tileNumber());
         startActivityAndCollapse(intent);
     }
 
@@ -129,11 +119,11 @@ public abstract class FavoriteAppTileService extends TileService {
         if(tile == null) return;
 
         SharedPreferences pref = U.getSharedPreferences(this);
-        if(pref.getBoolean(prefix + Constants.PREF_ADDED_SUFFIX, false)) {
+        if(pref.getBoolean(prefix + PREF_ADDED_SUFFIX, false)) {
             tile.setState(Tile.STATE_ACTIVE);
             tile.setLabel(pref.getString(prefix + PREF_LABEL_SUFFIX, getString(R.string.tb_new_shortcut)));
 
-            String componentName = pref.getString(prefix + PREF_PACKAGE_NAME_SUFFIX, null);
+            String componentName = pref.getString(prefix + PREF_COMPONENT_NAME_SUFFIX, null);
             float threshold = pref.getFloat(prefix + PREF_ICON_THRESHOLD_SUFFIX, -1);
 
             if(componentName != null && threshold >= 0) {

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/activity/TaskerActivityBase.java b/app/src/playstore/java/com/farmerbb/taskbar/activity/TaskerActivityBase.java
index 0cf9e78..f3b3855 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/activity/TaskerActivityBase.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/activity/TaskerActivityBase.java
@@ -16,7 +16,6 @@
 package com.farmerbb.taskbar.activity;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/util/ToastCompatImpl.java b/app/src/playstore/java/com/farmerbb/taskbar/util/ToastCompatImpl.java
index f534c01..0fc6d55 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/util/ToastCompatImpl.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/util/ToastCompatImpl.java
@@ -23,7 +23,7 @@ import com.farmerbb.taskbar.R;
 import moe.banana.support.ToastCompat;
 
 class ToastCompatImpl implements ToastInterface {
-    private ToastCompat toast;
+    private final ToastCompat toast;
 
     ToastCompatImpl(Context context, String message, int length) {
         toast = ToastCompat.makeText(context, message, length);