Introduce isStandalone() to PluginModule

Author: Jon Amireh

hyperion-attr/src/main/java/com/willowtreeapps/hyperion/attr/AttributeInspectorModule.java

@@ -49,6 +49,11 @@ protected void onDestroy() {
         menu.removeOnMenuStateChangedListener(this);
     }
 
+    @Override
+    public boolean isStandalone() {
+        return false;
+    }
+
     @Override
     public void onClick(View v) {
         final View currentOverlay = overlay.getOverlayView();

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/CoreComponent.java

@@ -40,6 +40,8 @@ interface CoreComponent {
 
     Set<PluginModule> getPluginModules();
 
+    PluginFilter getPluginFilter();
+
     @Component.Builder
     interface Builder {
 
@@ -48,9 +50,6 @@ interface Builder {
         @BindsInstance
         Builder activity(Activity activity);
 
-        @BindsInstance
-        Builder pluginSource(PluginSource pluginSource);
-
         @BindsInstance
         Builder activityResults(ActivityResults activityResults);
 
@@ -60,6 +59,9 @@ interface Builder {
         @BindsInstance
         Builder container(ViewGroup container);
 
+        @BindsInstance
+        Builder pluginFilter(PluginFilter pluginFilter);
+
         CoreComponent build();
     }
 

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/HyperionPluginView.java

@@ -33,6 +33,9 @@ public class HyperionPluginView extends FrameLayout {
     @Inject
     Set<PluginModule> modules;
 
+    @Inject
+    PluginFilter filter;
+
     public HyperionPluginView(@NonNull Context context) {
         this(context, null);
     }
@@ -66,9 +69,11 @@ public WindowInsetsCompat onApplyWindowInsets(View v, WindowInsetsCompat insets)
             }
         });
 
+        Set<PluginModule> filteredModules = filter.filter(modules);
+
         final Comparator<PluginModule> comparator = new AlphabeticalComparator(getContext());
         final Set<PluginModule> sortedModules = new TreeSet<>(comparator);
-        sortedModules.addAll(modules);
+        sortedModules.addAll(filteredModules);
 
         final Context inflaterContext = new PluginExtensionContextWrapper(getContext(), pluginExtension);
         final LayoutInflater inflater = LayoutInflater.from(inflaterContext);
@@ -88,7 +93,7 @@ static final class Factory implements PluginViewFactory {
             this.container = container;
         }
 
-        private CoreComponent getCoreComponent(Activity activity) {
+        private CoreComponent getCoreComponent(Activity activity, boolean standalone) {
             final ViewGroup windowContentView = activity.getWindow().findViewById(android.R.id.content);
             final HyperionMenuController controller = new HyperionMenuController(windowContentView);
 
@@ -102,13 +107,18 @@ private CoreComponent getCoreComponent(Activity activity) {
                         .commit();
             }
 
+            PluginFilter filter = new IdentityPluginFilter();
+            if(standalone) {
+                filter = new StandalonePluginFilter();
+            }
+
             CoreComponent component = DaggerCoreComponent.builder()
                     .appComponent(AppComponent.Holder.getInstance(activity))
                     .activity(activity)
-                    .pluginSource(container.getPluginSource())
                     .menuController(controller)
                     .container(windowContentView)
                     .activityResults(activityResults)
+                    .pluginFilter(filter)
                     .build();
 
             container.putComponent(activity, component);
@@ -117,11 +127,11 @@ private CoreComponent getCoreComponent(Activity activity) {
 
         @Override
         public View create(Activity activity) {
-            return createInternal(activity, false);
+            return createInternal(activity, false, true);
         }
 
-        HyperionPluginView createInternal(Activity activity, Boolean bindToMenuController) {
-            CoreComponent component = getCoreComponent(activity);
+        HyperionPluginView createInternal(Activity activity, boolean bindToMenuController, boolean standalone) {
+            CoreComponent component = getCoreComponent(activity, standalone);
             HyperionPluginView pluginView = new HyperionPluginView(new ComponentContextThemeWrapper(activity, component));
             if(bindToMenuController) {
                 component.getMenuController().setPluginView(pluginView);

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/IdentityPluginFilter.java

@@ -0,0 +1,12 @@
+package com.willowtreeapps.hyperion.core.internal;
+
+import com.willowtreeapps.hyperion.plugin.v1.PluginModule;
+
+import java.util.Set;
+
+class IdentityPluginFilter implements PluginFilter {
+    @Override
+    public Set<PluginModule> filter(Set<PluginModule> plugins) {
+        return plugins;
+    }
+}

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/InstallationLifecycleDelegate.java

@@ -18,7 +18,7 @@ class InstallationLifecycleDelegate extends LifecycleDelegate {
 
     @Override
     public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
-        factory.createInternal(activity, true);
+        factory.createInternal(activity, true, false);
     }
 
     @Override

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/PluginFilter.java

@@ -0,0 +1,9 @@
+package com.willowtreeapps.hyperion.core.internal;
+
+import com.willowtreeapps.hyperion.plugin.v1.PluginModule;
+
+import java.util.Set;
+
+interface PluginFilter {
+    Set<PluginModule> filter(Set<PluginModule> plugins);
+}

hyperion-core/src/main/java/com/willowtreeapps/hyperion/core/internal/StandalonePluginFilter.java

@@ -0,0 +1,20 @@
+package com.willowtreeapps.hyperion.core.internal;
+
+import com.willowtreeapps.hyperion.plugin.v1.PluginModule;
+
+import java.util.HashSet;
+import java.util.Set;
+
+class StandalonePluginFilter implements PluginFilter {
+    @Override
+    public Set<PluginModule> filter(Set<PluginModule> plugins) {
+        HashSet<PluginModule> result = new HashSet<>();
+        for(PluginModule plugin : plugins) {
+            if(plugin.isStandalone()) {
+                result.add(plugin);
+            }
+        }
+        return result;
+    }
+}
+

hyperion-geiger-counter/src/main/java/com/willowtreeapps/hyperion/geigercounter/GeigerCounterModule.java

@@ -122,6 +122,11 @@ protected void onDestroy() {
         detector.removeObserver(this);
     }
 
+    @Override
+    public boolean isStandalone() {
+        return false;
+    }
+
     // OnClickListener
 
     @Override

hyperion-measurement/src/main/java/com/willowtreeapps/hyperion/measurement/MeasurementInspectorModule.java

@@ -40,6 +40,11 @@ protected void onDestroy() {
         overlay.removeOnOverlayViewChangedListener(this);
     }
 
+    @Override
+    public boolean isStandalone() {
+        return false;
+    }
+
     @Override
     public void onClick(View v) {
         View currentOverlay = overlay.getOverlayView();

hyperion-plugin/src/main/java/com/willowtreeapps/hyperion/plugin/v1/PluginModule.java

@@ -48,6 +48,10 @@ protected void onDestroy() {
 
     }
 
+    public boolean isStandalone() {
+        return true;
+    }
+
     @NonNull
     public final PluginExtension getExtension() {
         return this.extension;

hyperion-recorder/src/main/java/com/willowtreeapps/hyperion/recorder/RecorderPluginModule.java

@@ -58,6 +58,11 @@ protected void onDestroy() {
         RecordingManager.removeOnRecordingChangedListener(this);
     }
 
+    @Override
+    public boolean isStandalone() {
+        return false;
+    }
+
     @Override
     public void onClick(View v) {
         if (RecordingManager.isRecording()) {

hyperion-sample/src/main/AndroidManifest.xml

@@ -25,7 +25,7 @@
         <activity android:name=".ScreenRecorderActivity" />
         <activity android:name=".FileExplorerActivity" />
         <activity android:name=".GeigerCounterActivity" />
-        <activity android:name=".FactoryActivity" />
+        <activity android:name=".StandaloneActivity" />
 
     </application>
 

hyperion-sample/src/main/java/com/willowtreeapps/hyperion/sample/GestureFragment.java

@@ -35,7 +35,7 @@ public void onClick(View v) {
         openCustomMenuButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                startActivity(new Intent(v.getContext(), FactoryActivity.class));
+                startActivity(new Intent(v.getContext(), StandaloneActivity.class));
             }
         });
     }

hyperion-sample/src/main/java/com/willowtreeapps/hyperion/sample/FactoryActivity.java renamed to hyperion-sample/src/main/java/com/willowtreeapps/hyperion/sample/StandaloneActivity.java

@@ -12,7 +12,7 @@
 import com.willowtreeapps.hyperion.plugin.v1.HyperionIgnore;
 
 @HyperionIgnore
-public class FactoryActivity extends AppCompatActivity {
+public class StandaloneActivity extends AppCompatActivity {
     private final PluginViewFactory factory = Hyperion.getPluginViewFactory();
 
     @Override