Java code refactor (#623)

* Java code refactoring * Removed unused resources Removed unused resources
MozillaReality · Oct 16, 2018 · 81cbd41 · 81cbd41
1 parent bff223d
commit 81cbd41
Show file tree

Hide file tree

Showing 122 changed files with 155 additions and 80,275 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java b/app/src/common/shared/org/mozilla/vrbrowser/VRBrowserActivity.java
@@ -31,17 +31,25 @@
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.vrbrowser.audio.AudioEngine;
 import org.mozilla.vrbrowser.audio.VRAudioTheme;
+import org.mozilla.vrbrowser.browser.PermissionDelegate;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
+import org.mozilla.vrbrowser.crashreporting.CrashReporterService;
+import org.mozilla.vrbrowser.crashreporting.GlobalExceptionHandler;
+import org.mozilla.vrbrowser.input.MotionEventGenerator;
 import org.mozilla.vrbrowser.search.SearchEngine;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
-import org.mozilla.vrbrowser.ui.BrowserWidget;
-import org.mozilla.vrbrowser.ui.CrashDialogWidget;
-import org.mozilla.vrbrowser.ui.KeyboardWidget;
-import org.mozilla.vrbrowser.ui.NavigationBarWidget;
+import org.mozilla.vrbrowser.ui.widgets.BrowserWidget;
+import org.mozilla.vrbrowser.ui.widgets.CrashDialogWidget;
+import org.mozilla.vrbrowser.ui.widgets.KeyboardWidget;
+import org.mozilla.vrbrowser.ui.widgets.NavigationBarWidget;
 import org.mozilla.vrbrowser.ui.OffscreenDisplay;
-import org.mozilla.vrbrowser.ui.RootWidget;
-import org.mozilla.vrbrowser.ui.TopBarWidget;
-import org.mozilla.vrbrowser.ui.TrayWidget;
-import org.mozilla.vrbrowser.ui.UIWidget;
+import org.mozilla.vrbrowser.ui.widgets.RootWidget;
+import org.mozilla.vrbrowser.ui.widgets.TopBarWidget;
+import org.mozilla.vrbrowser.ui.widgets.TrayWidget;
+import org.mozilla.vrbrowser.ui.widgets.Widget;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
+import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 
 import java.io.IOException;
 import java.net.URISyntaxException;

diff --git a/...mozilla/vrbrowser/PermissionDelegate.java → ...vrbrowser/browser/PermissionDelegate.java b/...mozilla/vrbrowser/PermissionDelegate.java → ...vrbrowser/browser/PermissionDelegate.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.browser;
 
 import android.Manifest;
 import android.app.Activity;
@@ -8,7 +8,11 @@
 import android.util.Log;
 
 import org.mozilla.geckoview.GeckoSession;
-import org.mozilla.vrbrowser.ui.PermissionWidget;
+import org.mozilla.vrbrowser.PlatformActivity;
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.ui.widgets.PermissionWidget;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -24,7 +28,7 @@ public class PermissionDelegate implements GeckoSession.PermissionDelegate, Widg
     private GeckoSession.PermissionDelegate.Callback mCallback;
     private PermissionWidget mPermissionWidget;
 
-    PermissionDelegate(Context aContext, WidgetManagerDelegate aWidgetManager) {
+    public PermissionDelegate(Context aContext, WidgetManagerDelegate aWidgetManager) {
         mContext = aContext;
         mWidgetManager = aWidgetManager;
         mWidgetManager.addPermissionListener(this);

diff --git a/...d/org/mozilla/vrbrowser/SessionStore.java → ...zilla/vrbrowser/browser/SessionStore.java b/...d/org/mozilla/vrbrowser/SessionStore.java → ...zilla/vrbrowser/browser/SessionStore.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.browser;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -22,7 +22,11 @@
 import org.mozilla.geckoview.GeckoRuntimeSettings;
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.geckoview.GeckoSessionSettings;
+import org.mozilla.vrbrowser.BuildConfig;
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.crashreporting.CrashReporterService;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
+import org.mozilla.vrbrowser.utils.InternalPages;
 import org.mozilla.vrbrowser.utils.ValueHolder;
 
 import java.io.File;

diff --git a/.../org/mozilla/vrbrowser/SettingsStore.java → ...illa/vrbrowser/browser/SettingsStore.java b/.../org/mozilla/vrbrowser/SettingsStore.java → ...illa/vrbrowser/browser/SettingsStore.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.browser;
 
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -8,6 +8,7 @@
 import android.support.annotation.NonNull;
 
 import org.mozilla.telemetry.TelemetryHolder;
+import org.mozilla.vrbrowser.R;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
 
 

diff --git a/...zilla/vrbrowser/CrashReporterService.java → .../crashreporting/CrashReporterService.java b/...zilla/vrbrowser/CrashReporterService.java → .../crashreporting/CrashReporterService.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.crashreporting;
 
 import android.app.ActivityManager;
 import android.content.Context;
@@ -10,6 +10,8 @@
 import android.util.Log;
 
 import org.mozilla.geckoview.GeckoRuntime;
+import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.VRBrowserActivity;
 
 public class CrashReporterService extends JobIntentService {
 

diff --git a/...lla/vrbrowser/GlobalExceptionHandler.java → ...rashreporting/GlobalExceptionHandler.java b/...lla/vrbrowser/GlobalExceptionHandler.java → ...rashreporting/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.crashreporting;
 
 import android.support.annotation.NonNull;
 import android.util.Log;

diff --git a/.../mozilla/vrbrowser/ui/CustomKeyboard.java → ...zilla/vrbrowser/input/CustomKeyboard.java b/.../mozilla/vrbrowser/ui/CustomKeyboard.java → ...zilla/vrbrowser/input/CustomKeyboard.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.input;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -193,7 +193,7 @@ public int[] getNearestKeys(int x, int y) {
         return new int[0];
     }
 
-    void setImeOptions(int options) {
+    public void setImeOptions(int options) {
         if (mEnterKey == null) {
             return;
         }

diff --git a/...zilla/vrbrowser/MotionEventGenerator.java → ...vrbrowser/input/MotionEventGenerator.java b/...zilla/vrbrowser/MotionEventGenerator.java → ...vrbrowser/input/MotionEventGenerator.java
@@ -3,15 +3,17 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser;
+package org.mozilla.vrbrowser.input;
 
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.MotionEvent;
 import android.view.InputDevice;
 import android.util.SparseArray;
 
-class MotionEventGenerator {
+import org.mozilla.vrbrowser.ui.widgets.Widget;
+
+public class MotionEventGenerator {
     static final String LOGTAG = "VRB";
     static class Device {
         int mDevice;
@@ -63,7 +65,7 @@ private static void generateEvent(Widget aWidget, Device aDevice, int aAction, b
         event.recycle();
     }
 
-    static void dispatch(Widget aWidget, int aDevice, boolean aPressed, float aX, float aY) {
+    public static void dispatch(Widget aWidget, int aDevice, boolean aPressed, float aX, float aY) {
         Device device = devices.get(aDevice);
         if (device == null) {
             device = new Device(aDevice);
@@ -115,7 +117,7 @@ static void dispatch(Widget aWidget, int aDevice, boolean aPressed, float aX, fl
         device.mPreviousWidget = aWidget;
     }
 
-    static void dispatchScroll(Widget aWidget, int aDevice, float aX, float aY) {
+    public static void dispatchScroll(Widget aWidget, int aDevice, float aX, float aY) {
         Device device = devices.get(aDevice);
         if (device == null) {
             device = new Device(aDevice);

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java b/app/src/common/shared/org/mozilla/vrbrowser/search/SearchEngine.java
@@ -4,8 +4,8 @@
 import android.support.annotation.NonNull;
 import android.util.Log;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SessionStore;
-import org.mozilla.vrbrowser.SettingsStore;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java b/app/src/common/shared/org/mozilla/vrbrowser/telemetry/TelemetryWrapper.java
@@ -20,7 +20,7 @@
 import org.mozilla.telemetry.storage.FileTelemetryStorage;
 import org.mozilla.vrbrowser.BuildConfig;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SettingsStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
 import org.mozilla.vrbrowser.search.SearchEngine;
 import org.mozilla.vrbrowser.utils.UrlUtils;
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/prompts/ChoicePromptWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/prompts/ChoicePromptWidget.java
@@ -20,10 +20,10 @@
 
 import org.mozilla.geckoview.GeckoSession.PromptDelegate.Choice;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.WidgetManagerDelegate;
-import org.mozilla.vrbrowser.WidgetPlacement;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
+import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 import org.mozilla.vrbrowser.audio.AudioEngine;
-import org.mozilla.vrbrowser.ui.UIWidget;
+import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 
 import java.util.ArrayList;
 import java.util.Arrays;

diff --git a/...illa/vrbrowser/ui/CustomKeyboardView.java → ...rbrowser/ui/views/CustomKeyboardView.java b/...illa/vrbrowser/ui/CustomKeyboardView.java → ...rbrowser/ui/views/CustomKeyboardView.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -45,6 +45,7 @@
 import android.widget.TextView;
 
 import org.mozilla.vrbrowser.R;
+import org.mozilla.vrbrowser.input.CustomKeyboard;
 
 import java.lang.reflect.Method;
 import java.util.Arrays;

diff --git a/.../mozilla/vrbrowser/ui/CustomUIButton.java → ...la/vrbrowser/ui/views/CustomUIButton.java b/.../mozilla/vrbrowser/ui/CustomUIButton.java → ...la/vrbrowser/ui/views/CustomUIButton.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.graphics.drawable.Drawable;
 

diff --git a/...rbrowser/ui/DeveloperOptionsEditText.java → ...er/ui/views/DeveloperOptionsEditText.java b/...rbrowser/ui/DeveloperOptionsEditText.java → ...er/ui/views/DeveloperOptionsEditText.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.text.Editable;

diff --git a/...ozilla/vrbrowser/ui/NavigationURLBar.java → .../vrbrowser/ui/views/NavigationURLBar.java b/...ozilla/vrbrowser/ui/NavigationURLBar.java → .../vrbrowser/ui/views/NavigationURLBar.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.content.res.Resources;
@@ -22,7 +22,7 @@
 import android.view.inputmethod.EditorInfo;
 import android.widget.*;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SessionStore;
+import org.mozilla.vrbrowser.browser.SessionStore;
 import org.mozilla.vrbrowser.search.SearchEngine;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
 
@@ -206,7 +206,7 @@ private void syncViews() {
         mURL.setPadding(leftPadding, mURL.getPaddingTop(), mURL.getPaddingRight(), mURL.getPaddingBottom());
     }
 
-    protected void handleURLEdit(String text) {
+    public  void handleURLEdit(String text) {
         text = text.trim();
         URI uri = null;
         try {

diff --git a/.../mozilla/vrbrowser/ui/SettingsButton.java → ...la/vrbrowser/ui/views/SettingsButton.java b/.../mozilla/vrbrowser/ui/SettingsButton.java → ...la/vrbrowser/ui/views/SettingsButton.java
@@ -1,4 +1,4 @@
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.content.res.TypedArray;

diff --git a/...ed/org/mozilla/vrbrowser/ui/UIButton.java → .../mozilla/vrbrowser/ui/views/UIButton.java b/...ed/org/mozilla/vrbrowser/ui/UIButton.java → .../mozilla/vrbrowser/ui/views/UIButton.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

diff --git a/...rg/mozilla/vrbrowser/ui/UITextButton.java → ...illa/vrbrowser/ui/views/UITextButton.java b/...rg/mozilla/vrbrowser/ui/UITextButton.java → ...illa/vrbrowser/ui/views/UITextButton.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.views;
 
 import android.content.Context;
 import android.content.res.ColorStateList;

diff --git a/...g/mozilla/vrbrowser/ui/BrowserWidget.java → ...a/vrbrowser/ui/widgets/BrowserWidget.java b/...g/mozilla/vrbrowser/ui/BrowserWidget.java → ...a/vrbrowser/ui/widgets/BrowserWidget.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.widgets;
 
 import android.content.Context;
 import android.graphics.Rect;
@@ -20,6 +20,8 @@
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.geckoview.GeckoSessionSettings;
 import org.mozilla.vrbrowser.*;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
 import org.mozilla.vrbrowser.ui.prompts.ChoicePromptWidget;
 
 

diff --git a/...zilla/vrbrowser/ui/CloseButtonWidget.java → ...browser/ui/widgets/CloseButtonWidget.java b/...zilla/vrbrowser/ui/CloseButtonWidget.java → ...browser/ui/widgets/CloseButtonWidget.java
@@ -1,11 +1,11 @@
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.WidgetPlacement;
 import org.mozilla.vrbrowser.audio.AudioEngine;
+import org.mozilla.vrbrowser.ui.views.UIButton;
 
 public class CloseButtonWidget extends UIWidget {
 

diff --git a/...zilla/vrbrowser/ui/CrashDialogWidget.java → ...browser/ui/widgets/CrashDialogWidget.java b/...zilla/vrbrowser/ui/CrashDialogWidget.java → ...browser/ui/widgets/CrashDialogWidget.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -13,10 +13,8 @@
 import android.widget.CompoundButton;
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SessionStore;
-import org.mozilla.vrbrowser.SettingsStore;
-import org.mozilla.vrbrowser.WidgetManagerDelegate;
-import org.mozilla.vrbrowser.WidgetPlacement;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
 import org.mozilla.vrbrowser.audio.AudioEngine;
 
 public class CrashDialogWidget extends UIWidget implements WidgetManagerDelegate.FocusChangeListener {

diff --git a/.../vrbrowser/ui/DeveloperOptionsWidget.java → ...er/ui/widgets/DeveloperOptionsWidget.java b/.../vrbrowser/ui/DeveloperOptionsWidget.java → ...er/ui/widgets/DeveloperOptionsWidget.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.widgets;
 
 import android.content.Context;
 import android.util.AttributeSet;
@@ -12,10 +12,10 @@
 import android.widget.RadioGroup;
 
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SessionStore;
-import org.mozilla.vrbrowser.SettingsStore;
-import org.mozilla.vrbrowser.WidgetPlacement;
+import org.mozilla.vrbrowser.browser.SessionStore;
+import org.mozilla.vrbrowser.browser.SettingsStore;
 import org.mozilla.vrbrowser.audio.AudioEngine;
+import org.mozilla.vrbrowser.ui.views.UIButton;
 import org.mozilla.vrbrowser.ui.settings.ButtonSetting;
 import org.mozilla.vrbrowser.ui.settings.DoubleEditSetting;
 import org.mozilla.vrbrowser.ui.settings.SingleEditSetting;

diff --git a/.../mozilla/vrbrowser/ui/KeyboardWidget.java → .../vrbrowser/ui/widgets/KeyboardWidget.java b/.../mozilla/vrbrowser/ui/KeyboardWidget.java → .../vrbrowser/ui/widgets/KeyboardWidget.java
@@ -3,7 +3,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-package org.mozilla.vrbrowser.ui;
+package org.mozilla.vrbrowser.ui.widgets;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
@@ -26,10 +26,11 @@
 import android.widget.RelativeLayout;
 import org.mozilla.geckoview.GeckoSession;
 import org.mozilla.vrbrowser.R;
-import org.mozilla.vrbrowser.SessionStore;
-import org.mozilla.vrbrowser.WidgetManagerDelegate;
-import org.mozilla.vrbrowser.WidgetPlacement;
+import org.mozilla.vrbrowser.browser.SessionStore;
 import org.mozilla.vrbrowser.telemetry.TelemetryWrapper;
+import org.mozilla.vrbrowser.input.CustomKeyboard;
+import org.mozilla.vrbrowser.ui.views.CustomKeyboardView;
+import org.mozilla.vrbrowser.ui.views.UIButton;
 
 
 public class KeyboardWidget extends UIWidget implements CustomKeyboardView.OnKeyboardActionListener,