Merge pull request #1392 from Neamar/widgetS

Support for multiple Widgets

Author: Neamar

app/src/main/java/fr/neamar/kiss/MainActivity.java

@@ -238,7 +238,7 @@ public void onReceive(Context context, Intent intent) {
         // Add touch listener for history popup to root view
         findViewById(android.R.id.content).setOnTouchListener(this);
 
-        // add history popup touch listener to empty view (prevents on not working there)
+        // add history popup touch listener to empty view (prevents it from not working there)
         this.emptyListView.setOnTouchListener(this);
 
         // Create adapter for records
@@ -358,7 +358,7 @@ public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMen
         super.onCreateContextMenu(menu, v, menuInfo);
         MenuInflater inflater = getMenuInflater();
         inflater.inflate(R.menu.menu_main, menu);
-        forwarderManager.onCreateContextMenu(menu, v, menuInfo);
+        forwarderManager.onCreateContextMenu(menu);
     }
 
     @Override

app/src/main/java/fr/neamar/kiss/forwarder/ForwarderManager.java

@@ -11,7 +11,7 @@
 import fr.neamar.kiss.MainActivity;
 
 public class ForwarderManager extends Forwarder {
-    private final Widget widgetForwarder;
+    private final Widgets widgetsForwarder;
     private final LiveWallpaper liveWallpaperForwarder;
     private final InterfaceTweaks interfaceTweaks;
     private final ExperienceTweaks experienceTweaks;
@@ -25,7 +25,7 @@ public class ForwarderManager extends Forwarder {
     public ForwarderManager(MainActivity mainActivity) {
         super(mainActivity);
 
-        this.widgetForwarder = new Widget(mainActivity);
+        this.widgetsForwarder = new Widgets(mainActivity);
         this.interfaceTweaks = new InterfaceTweaks(mainActivity);
         this.liveWallpaperForwarder = new LiveWallpaper(mainActivity);
         this.experienceTweaks = new ExperienceTweaks(mainActivity);
@@ -38,7 +38,7 @@ public ForwarderManager(MainActivity mainActivity) {
 
     public void onCreate() {
         favoritesForwarder.onCreate();
-        widgetForwarder.onCreate();
+        widgetsForwarder.onCreate();
         interfaceTweaks.onCreate();
         experienceTweaks.onCreate();
         shortcutsForwarder.onCreate();
@@ -47,7 +47,7 @@ public void onCreate() {
     }
 
     public void onStart() {
-        widgetForwarder.onStart();
+        widgetsForwarder.onStart();
     }
 
     public void onResume() {
@@ -62,23 +62,23 @@ public void onPause() {
     }
 
     public void onStop() {
-        widgetForwarder.onStop();
+        widgetsForwarder.onStop();
     }
 
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-        widgetForwarder.onActivityResult(requestCode, resultCode, data);
+        widgetsForwarder.onActivityResult(requestCode, resultCode, data);
     }
 
-    public void onRequestPermissionsResult(int requestCode, @NonNull String permissions[], @NonNull int[] grantResults) {
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
         permissionForwarder.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
 
     public boolean onOptionsItemSelected(MenuItem item) {
-        return widgetForwarder.onOptionsItemSelected(item);
+        return widgetsForwarder.onOptionsItemSelected(item);
     }
 
-    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo) {
-        widgetForwarder.onCreateContextMenu(menu, v, menuInfo);
+    public void onCreateContextMenu(ContextMenu menu) {
+        widgetsForwarder.onCreateContextMenu(menu);
     }
 
     public boolean onTouch(View view, MotionEvent event) {
@@ -91,7 +91,7 @@ public void onWindowFocusChanged(boolean hasFocus) {
     }
 
     public void onDataSetChanged() {
-        widgetForwarder.onDataSetChanged();
+        widgetsForwarder.onDataSetChanged();
         favoritesForwarder.onDataSetChanged();
     }