Move backup classes to nonlib

diff --git a/app/src/main/java/com/farmerbb/taskbar/backup/BackupAgent.java b/app/src/nonlib/java/com/farmerbb/taskbar/util/BackupAgent.java
similarity index 95%
rename from app/src/main/java/com/farmerbb/taskbar/backup/BackupAgent.java
rename to app/src/nonlib/java/com/farmerbb/taskbar/util/BackupAgent.java
index 507c6a3..dcbaefe 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/backup/BackupAgent.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/util/BackupAgent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.farmerbb.taskbar.backup;
+package com.farmerbb.taskbar.util;
 
 public interface BackupAgent {
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/backup/BackupUtils.java b/app/src/nonlib/java/com/farmerbb/taskbar/util/BackupUtils.java
similarity index 96%
rename from app/src/main/java/com/farmerbb/taskbar/backup/BackupUtils.java
rename to app/src/nonlib/java/com/farmerbb/taskbar/util/BackupUtils.java
index 32aebe4..baaf570 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/backup/BackupUtils.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/util/BackupUtils.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.farmerbb.taskbar.backup;
+package com.farmerbb.taskbar.util;
 
 import android.content.ComponentName;
 import android.content.Context;
@@ -22,16 +22,6 @@ import android.content.pm.LauncherApps;
 import android.os.Process;
 import android.os.UserManager;
 
-import com.farmerbb.taskbar.util.AppEntry;
-import com.farmerbb.taskbar.util.Blacklist;
-import com.farmerbb.taskbar.util.BlacklistEntry;
-import com.farmerbb.taskbar.util.IconCache;
-import com.farmerbb.taskbar.util.PinnedBlockedApps;
-import com.farmerbb.taskbar.util.SavedWindowSizes;
-import com.farmerbb.taskbar.util.SavedWindowSizesEntry;
-import com.farmerbb.taskbar.util.TopApps;
-import com.farmerbb.taskbar.util.U;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;

diff --git a/app/src/main/java/com/farmerbb/taskbar/backup/IntentBackupAgent.java b/app/src/nonlib/java/com/farmerbb/taskbar/util/IntentBackupAgent.java
similarity index 97%
rename from app/src/main/java/com/farmerbb/taskbar/backup/IntentBackupAgent.java
rename to app/src/nonlib/java/com/farmerbb/taskbar/util/IntentBackupAgent.java
index b60c340..4da8fad 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/backup/IntentBackupAgent.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/util/IntentBackupAgent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.farmerbb.taskbar.backup;
+package com.farmerbb.taskbar.util;
 
 import android.content.Intent;
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/backup/JSONBackupAgent.java b/app/src/nonlib/java/com/farmerbb/taskbar/util/JSONBackupAgent.java
similarity index 98%
rename from app/src/main/java/com/farmerbb/taskbar/backup/JSONBackupAgent.java
rename to app/src/nonlib/java/com/farmerbb/taskbar/util/JSONBackupAgent.java
index 1dac22f..7a89085 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/backup/JSONBackupAgent.java
+++ b/app/src/nonlib/java/com/farmerbb/taskbar/util/JSONBackupAgent.java
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-package com.farmerbb.taskbar.backup;
+package com.farmerbb.taskbar.util;
 
 import org.json.JSONArray;
 import org.json.JSONException;

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
index ed40ae1..920c4a1 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
@@ -22,8 +22,8 @@ import android.net.Uri;
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
 
 import com.farmerbb.taskbar.BuildConfig;
-import com.farmerbb.taskbar.backup.BackupUtils;
-import com.farmerbb.taskbar.backup.IntentBackupAgent;
+import com.farmerbb.taskbar.util.BackupUtils;
+import com.farmerbb.taskbar.util.IntentBackupAgent;
 import com.farmerbb.taskbar.util.U;
 
 import java.io.File;

diff --git a/app/src/playstore/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java b/app/src/playstore/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
index 0b50632..01d54a3 100644 (file)
--- a/app/src/playstore/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
+++ b/app/src/playstore/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
@@ -22,8 +22,8 @@ import android.net.Uri;
 import androidx.core.content.FileProvider;
 
 import com.farmerbb.taskbar.BuildConfig;
-import com.farmerbb.taskbar.backup.BackupUtils;
-import com.farmerbb.taskbar.backup.IntentBackupAgent;
+import com.farmerbb.taskbar.util.BackupUtils;
+import com.farmerbb.taskbar.util.IntentBackupAgent;
 import com.farmerbb.taskbar.util.U;
 
 import java.io.File;