Rename base Host / Controller classes

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
index 2ae5c52..2fd3a55 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HomeActivityDelegate.java
@@ -41,7 +41,7 @@ import com.farmerbb.taskbar.service.NotificationService;
 import com.farmerbb.taskbar.service.StartMenuService;
 import com.farmerbb.taskbar.service.TaskbarService;
 import com.farmerbb.taskbar.ui.DashboardController;
-import com.farmerbb.taskbar.ui.Host;
+import com.farmerbb.taskbar.ui.UIHost;
 import com.farmerbb.taskbar.ui.ViewParams;
 import com.farmerbb.taskbar.ui.StartMenuController;
 import com.farmerbb.taskbar.ui.TaskbarController;
@@ -52,7 +52,7 @@ import com.farmerbb.taskbar.util.IconCache;
 import com.farmerbb.taskbar.util.LauncherHelper;
 import com.farmerbb.taskbar.util.U;
 
-public class HomeActivityDelegate extends Activity implements Host {
+public class HomeActivityDelegate extends Activity implements UIHost {
     private TaskbarController taskbarController;
     private StartMenuController startMenuController;
     private DashboardController dashboardController;

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java b/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java
index f5b2d1c..9888cc3 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/DashboardService.java
@@ -16,12 +16,12 @@
 package com.farmerbb.taskbar.service;
 
 import com.farmerbb.taskbar.ui.DashboardController;
-import com.farmerbb.taskbar.ui.HostService;
-import com.farmerbb.taskbar.ui.Controller;
+import com.farmerbb.taskbar.ui.UIHostService;
+import com.farmerbb.taskbar.ui.UIController;
 
-public class DashboardService extends HostService {
+public class DashboardService extends UIHostService {
     @Override
-    public Controller newController() {
+    public UIController newController() {
         return new DashboardController(this);
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
index e212ccd..d9bf2eb 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/StartMenuService.java
@@ -15,13 +15,13 @@
 
 package com.farmerbb.taskbar.service;
 
-import com.farmerbb.taskbar.ui.HostService;
+import com.farmerbb.taskbar.ui.UIHostService;
 import com.farmerbb.taskbar.ui.StartMenuController;
-import com.farmerbb.taskbar.ui.Controller;
+import com.farmerbb.taskbar.ui.UIController;
 
-public class StartMenuService extends HostService {
+public class StartMenuService extends UIHostService {
     @Override
-    public Controller newController() {
+    public UIController newController() {
         return new StartMenuController(this);
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
index 0bc5581..f382349 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
@@ -15,13 +15,13 @@
 
 package com.farmerbb.taskbar.service;
 
-import com.farmerbb.taskbar.ui.HostService;
-import com.farmerbb.taskbar.ui.Controller;
+import com.farmerbb.taskbar.ui.UIHostService;
+import com.farmerbb.taskbar.ui.UIController;
 import com.farmerbb.taskbar.ui.TaskbarController;
 
-public class TaskbarService extends HostService {
+public class TaskbarService extends UIHostService {
     @Override
-    public Controller newController() {
+    public UIController newController() {
         return new TaskbarController(this);
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java b/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
index 1127730..a19a0de 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/DashboardController.java
@@ -68,7 +68,7 @@ import com.farmerbb.taskbar.util.U;
 
 import java.util.List;
 
-public class DashboardController implements Controller {
+public class DashboardController implements UIController {
 
     private AppWidgetManager mAppWidgetManager;
     private AppWidgetHost mAppWidgetHost;
@@ -161,7 +161,7 @@ public class DashboardController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onCreateHost(Host host) {
+    public void onCreateHost(UIHost host) {
         SharedPreferences pref = U.getSharedPreferences(context);
         if(pref.getBoolean("dashboard", false)) {
             if(pref.getBoolean("taskbar_active", false) || LauncherHelper.getInstance().isOnHomeScreen()) {
@@ -177,7 +177,7 @@ public class DashboardController implements Controller {
     }
 
     @SuppressLint("RtlHardcoded")
-    private void drawDashboard(Host host) {
+    private void drawDashboard(UIHost host) {
         final ViewParams params = new ViewParams(
                 WindowManager.LayoutParams.MATCH_PARENT,
                 WindowManager.LayoutParams.MATCH_PARENT,
@@ -416,7 +416,7 @@ public class DashboardController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onRecreateHost(Host host) {
+    public void onRecreateHost(UIHost host) {
         if(layout != null) {
             try {
                 host.removeView(layout);
@@ -434,7 +434,7 @@ public class DashboardController implements Controller {
     }
 
     @Override
-    public void onDestroyHost(Host host) {
+    public void onDestroyHost(UIHost host) {
         if(layout != null)
             try {
                 host.removeView(layout);

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 9ead067..94bac86 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/StartMenuController.java
@@ -57,7 +57,6 @@ import android.widget.ListAdapter;
 import android.widget.TextView;
 
 import com.farmerbb.taskbar.R;
-import com.farmerbb.taskbar.activity.HomeActivity;
 import com.farmerbb.taskbar.activity.HomeActivityDelegate;
 import com.farmerbb.taskbar.activity.InvisibleActivity;
 import com.farmerbb.taskbar.activity.InvisibleActivityAlt;
@@ -78,7 +77,7 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-public class StartMenuController implements Controller {
+public class StartMenuController implements UIController {
 
     private Context context;
     private StartMenuLayout layout;
@@ -166,7 +165,7 @@ public class StartMenuController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onCreateHost(Host host) {
+    public void onCreateHost(UIHost host) {
         hasHardwareKeyboard = context.getResources().getConfiguration().keyboard != Configuration.KEYBOARD_NOKEYS;
 
         SharedPreferences pref = U.getSharedPreferences(context);
@@ -182,7 +181,7 @@ public class StartMenuController implements Controller {
     }
 
     @SuppressLint("RtlHardcoded")
-    private void drawStartMenu(Host host) {
+    private void drawStartMenu(UIHost host) {
         IconCache.getInstance(context).clearCache();
 
         final SharedPreferences pref = U.getSharedPreferences(context);
@@ -690,7 +689,7 @@ public class StartMenuController implements Controller {
     }
 
     @Override
-    public void onDestroyHost(Host host) {
+    public void onDestroyHost(UIHost host) {
         if(layout != null)
             try {
                 host.removeView(layout);
@@ -710,7 +709,7 @@ public class StartMenuController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onRecreateHost(Host host) {
+    public void onRecreateHost(UIHost host) {
         if(layout != null) {
             try {
                 host.removeView(layout);

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 e149b14..4ead677 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/TaskbarController.java
@@ -84,7 +84,7 @@ import com.farmerbb.taskbar.util.PinnedBlockedApps;
 import com.farmerbb.taskbar.util.MenuHelper;
 import com.farmerbb.taskbar.util.U;
 
-public class TaskbarController implements Controller {
+public class TaskbarController implements UIController {
 
     private Context context;
     private LinearLayout layout;
@@ -182,7 +182,7 @@ public class TaskbarController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onCreateHost(Host host) {
+    public void onCreateHost(UIHost host) {
         SharedPreferences pref = U.getSharedPreferences(context);
         if(pref.getBoolean("taskbar_active", false) || LauncherHelper.getInstance().isOnHomeScreen()) {
             if(U.canDrawOverlays(context, host instanceof HomeActivityDelegate))
@@ -196,7 +196,7 @@ public class TaskbarController implements Controller {
     }
 
     @SuppressLint("RtlHardcoded")
-    private void drawTaskbar(Host host) {
+    private void drawTaskbar(UIHost host) {
         IconCache.getInstance(context).clearCache();
 
         // Initialize layout params
@@ -1093,7 +1093,7 @@ public class TaskbarController implements Controller {
     }
 
     @Override
-    public void onDestroyHost(Host host) {
+    public void onDestroyHost(UIHost host) {
         shouldRefreshRecents = false;
 
         if(layout != null)
@@ -1142,7 +1142,7 @@ public class TaskbarController implements Controller {
 
     @TargetApi(Build.VERSION_CODES.M)
     @Override
-    public void onRecreateHost(Host host) {
+    public void onRecreateHost(UIHost host) {
         if(layout != null) {
             try {
                 host.removeView(layout);

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/Controller.java b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
similarity index 81%
rename from app/src/main/java/com/farmerbb/taskbar/ui/Controller.java
rename to app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
index af9088b..1aa2d4d 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/Controller.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/UIController.java
@@ -15,8 +15,8 @@
 
 package com.farmerbb.taskbar.ui;
 
-public interface Controller {
-    void onCreateHost(Host host);
-    void onRecreateHost(Host host);
-    void onDestroyHost(Host host);
+public interface UIController {
+    void onCreateHost(UIHost host);
+    void onRecreateHost(UIHost host);
+    void onDestroyHost(UIHost host);
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/Host.java b/app/src/main/java/com/farmerbb/taskbar/ui/UIHost.java
similarity index 96%
rename from app/src/main/java/com/farmerbb/taskbar/ui/Host.java
rename to app/src/main/java/com/farmerbb/taskbar/ui/UIHost.java
index cadf197..1ea55a8 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/Host.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/UIHost.java
@@ -17,7 +17,7 @@ package com.farmerbb.taskbar.ui;
 
 import android.view.View;
 
-public interface Host {
+public interface UIHost {
     void addView(View view, ViewParams params);
     void removeView(View view);
     void terminate();

diff --git a/app/src/main/java/com/farmerbb/taskbar/ui/HostService.java b/app/src/main/java/com/farmerbb/taskbar/ui/UIHostService.java
similarity index 93%
rename from app/src/main/java/com/farmerbb/taskbar/ui/HostService.java
rename to app/src/main/java/com/farmerbb/taskbar/ui/UIHostService.java
index 3d27507..db53b0c 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/ui/HostService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/ui/UIHostService.java
@@ -25,9 +25,9 @@ import android.view.WindowManager;
 
 import com.farmerbb.taskbar.util.U;
 
-public abstract class HostService extends Service implements Host {
+public abstract class UIHostService extends Service implements UIHost {
 
-    private Controller controller;
+    private UIController controller;
     private WindowManager windowManager;
 
     @Override
@@ -87,5 +87,5 @@ public abstract class HostService extends Service implements Host {
         stopSelf();
     }
 
-    public abstract Controller newController();
+    public abstract UIController newController();
 }
\ No newline at end of file