Dying again

This commit is contained in:
hyb1996
2017-04-30 18:20:59 +08:00
parent 5a0095f70d
commit 37b5108637
51 changed files with 569 additions and 146 deletions

View File

@@ -6,6 +6,7 @@ import android.os.Build;
import android.provider.Settings;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.util.IntentUtil;
/**
@@ -14,7 +15,7 @@ import com.stardust.util.IntentUtil;
public class FloatingWindowManger {
public static void showFloatingWindow() {
public static void showHoverMenu() {
if (!HoverMenuService.isServiceRunning()) {
if (!hasFloatingWindowPermission()) {
goToFloatingWindowPermissionSetting();

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window;
package com.stardust.scriptdroid.external.floating_window.console;
import android.content.Context;
import android.content.ContextWrapper;
@@ -6,21 +6,28 @@ import android.support.annotation.Nullable;
import android.view.ContextThemeWrapper;
import android.view.View;
import com.stardust.enhancedfloaty.ResizableExpandableFloaty;
import com.stardust.enhancedfloaty.ResizableExpandableFloatyService;
import com.stardust.enhancedfloaty.ResizableFloaty;
import com.stardust.enhancedfloaty.ResizableFloatyService;
import com.stardust.scriptdroid.R;
/**
* Created by Stardust on 2017/4/20.
*/
public class ConsoleFloaty extends ResizableFloaty {
public class ConsoleFloaty extends ResizableExpandableFloaty {
private ContextWrapper mContextWrapper;
private View mResizer, mMoveCursor;
public ConsoleFloaty() {
setShouldRequestFocusWhenExpand(false);
}
@Override
public View inflateCollapsedView(ResizableFloatyService service) {
public View inflateCollapsedView(ResizableExpandableFloatyService service) {
ensureContextWrapper(service);
return View.inflate(mContextWrapper, R.layout.floating_window_collapse, null);
}
@@ -32,28 +39,27 @@ public class ConsoleFloaty extends ResizableFloaty {
}
@Override
public View inflateExpandedView(ResizableFloatyService service) {
public View inflateExpandedView(ResizableExpandableFloatyService service) {
ensureContextWrapper(service);
View view = View.inflate(mContextWrapper, R.layout.floating_console_expand, null);
setListeners(view, service);
return view;
}
private void setListeners(final View view, final ResizableFloatyService service) {
private void setListeners(final View view, final ResizableExpandableFloatyService service) {
view.findViewById(R.id.close).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
service.stopSelf();
service.stopForeground(true);
}
});
view.findViewById(R.id.move_or_resize).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if(mMoveCursor.getVisibility() == View.VISIBLE){
if (mMoveCursor.getVisibility() == View.VISIBLE) {
mMoveCursor.setVisibility(View.GONE);
mResizer.setVisibility(View.GONE);
}else {
} else {
mMoveCursor.setVisibility(View.VISIBLE);
mResizer.setVisibility(View.VISIBLE);
}

View File

@@ -1,7 +1,8 @@
package com.stardust.scriptdroid.external.floating_window;
package com.stardust.scriptdroid.external.floating_window.console;
import android.content.Context;
import com.stardust.enhancedfloaty.ResizableExpandableFloatyService;
import com.stardust.enhancedfloaty.ResizableFloatyService;
/**
@@ -11,6 +12,6 @@ import com.stardust.enhancedfloaty.ResizableFloatyService;
public class FloatingConsole {
public static void startFloatingService(Context context) {
ResizableFloatyService.startService(context, new ConsoleFloaty());
ResizableExpandableFloatyService.startService(context, new ConsoleFloaty());
}
}

View File

@@ -0,0 +1,8 @@
package com.stardust.scriptdroid.external.floating_window.console;
/**
* Created by Stardust on 2017/4/30.
*/
public class FloatingConsoleService {
}

View File

@@ -0,0 +1,40 @@
package com.stardust.scriptdroid.external.floating_window.console;
import android.content.Context;
import android.graphics.Color;
import android.util.AttributeSet;
import android.widget.TextView;
import com.jraska.console.Console;
import com.stardust.scriptdroid.R;
/**
* Created by Stardust on 2017/4/30.
*/
public class FloatingConsoleView extends Console {
public FloatingConsoleView(Context context) {
super(context);
init();
}
public FloatingConsoleView(Context context, AttributeSet attrs) {
super(context, attrs);
init();
}
public FloatingConsoleView(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
init();
}
public FloatingConsoleView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
init();
}
private void init() {
findViewById(R.id.console_scroll_view).setBackground(getBackground());
((TextView) findViewById(R.id.console_text)).setTextIsSelectable(true);
}
}

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window;
package com.stardust.scriptdroid.external.floating_window.menu;
import android.content.Context;
import android.content.res.Resources;
@@ -16,9 +16,9 @@ import android.util.TypedValue;
import android.view.View;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.external.floating_window.content.MainMenuNavigatorContent;
import com.stardust.scriptdroid.external.floating_window.content.RecordNavigatorContent;
import com.stardust.scriptdroid.external.floating_window.content.ScriptListNavigatorContent;
import com.stardust.scriptdroid.external.floating_window.menu.content.MainMenuNavigatorContent;
import com.stardust.scriptdroid.external.floating_window.menu.content.RecordNavigatorContent;
import com.stardust.scriptdroid.external.floating_window.menu.content.ScriptListNavigatorContent;
import com.stardust.theme.ThemeColorManagerCompat;
import java.util.ArrayList;

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window;
package com.stardust.scriptdroid.external.floating_window.menu;
import android.app.Service;
@@ -17,9 +17,9 @@ import com.stardust.hover.SimpleHoverMenuTransitionListener;
import com.stardust.hover.WindowHoverMenu;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.external.floating_window.view.FloatingLayoutBoundsView;
import com.stardust.scriptdroid.external.floating_window.view.FloatingLayoutHierarchyView;
import com.stardust.scriptdroid.layout_inspector.LayoutInspector;
import com.stardust.scriptdroid.external.floating_window.FloatingWindowManger;
import com.stardust.scriptdroid.external.floating_window.menu.view.FloatingLayoutBoundsView;
import com.stardust.scriptdroid.external.floating_window.menu.view.FloatingLayoutHierarchyView;
import com.stardust.scriptdroid.layout_inspector.NodeInfo;
import com.stardust.scriptdroid.tool.AccessibilityServiceTool;
import com.stardust.theme.ThemeColorManagerCompat;

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window.content;
package com.stardust.scriptdroid.external.floating_window.menu.content;
import android.annotation.SuppressLint;
import android.content.Context;
@@ -11,9 +11,7 @@ import android.widget.Toast;
import com.stardust.scriptdroid.App;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.view.accessibility.AccessibilityInfoProvider;
import com.stardust.scriptdroid.external.floating_window.HoverMenuService;
import com.stardust.scriptdroid.layout_inspector.LayoutInspector;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.util.ClipboardUtil;
import com.stardust.scriptdroid.ui.main.MainActivity;
import com.stardust.util.MessageEvent;

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window.content;
package com.stardust.scriptdroid.external.floating_window.menu.content;
import android.content.Context;
import android.support.annotation.NonNull;
@@ -14,7 +14,7 @@ import com.stardust.scriptdroid.Pref;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.accessibility.AccessibilityEventHelper;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.external.floating_window.HoverMenuService;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.scriptdroid.record.Recorder;
import com.stardust.scriptdroid.record.accessibility.AccessibilityActionRecorder;
import com.stardust.scriptdroid.record.inputevent.InputEventConverter;

View File

@@ -1,4 +1,4 @@
package com.stardust.scriptdroid.external.floating_window.content;
package com.stardust.scriptdroid.external.floating_window.menu.content;
import android.content.Context;
import android.support.annotation.NonNull;
@@ -10,7 +10,7 @@ import android.view.ViewGroup;
import com.stardust.autojs.script.FileScriptSource;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.autojs.AutoJs;
import com.stardust.scriptdroid.external.floating_window.HoverMenuService;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.scriptdroid.scripts.ScriptFile;
import com.stardust.scriptdroid.scripts.StorageScriptProvider;
import com.stardust.scriptdroid.ui.edit.EditActivity;

View File

@@ -1,21 +1,18 @@
package com.stardust.scriptdroid.external.floating_window.view;
package com.stardust.scriptdroid.external.floating_window.menu.view;
import android.content.Context;
import android.graphics.Color;
import android.view.KeyEvent;
import android.view.WindowManager;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
import com.stardust.scriptdroid.external.floating_window.HoverMenuService;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.scriptdroid.layout_inspector.NodeInfo;
import com.stardust.scriptdroid.layout_inspector.view.LayoutBoundsView;
import com.stardust.scriptdroid.layout_inspector.view.NodeInfoView;
import com.stardust.scriptdroid.layout_inspector.view.OnNodeInfoSelectListener;
import com.stardust.util.MessageEvent;
import org.greenrobot.eventbus.EventBus;
/**
* Created by Stardust on 2017/3/12.
*/

View File

@@ -1,24 +1,18 @@
package com.stardust.scriptdroid.external.floating_window.view;
package com.stardust.scriptdroid.external.floating_window.menu.view;
import android.content.Context;
import android.content.DialogInterface;
import android.util.Log;
import android.view.KeyEvent;
import android.view.View;
import android.view.WindowManager;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
import com.stardust.scriptdroid.R;
import com.stardust.scriptdroid.external.floating_window.HoverMenuService;
import com.stardust.scriptdroid.external.floating_window.menu.HoverMenuService;
import com.stardust.scriptdroid.layout_inspector.NodeInfo;
import com.stardust.scriptdroid.layout_inspector.view.LayoutHierarchyView;
import com.stardust.scriptdroid.layout_inspector.view.NodeInfoView;
import com.stardust.scriptdroid.layout_inspector.view.OnNodeInfoSelectListener;
import com.stardust.util.MessageEvent;
import org.greenrobot.eventbus.EventBus;
/**
* Created by Stardust on 2017/3/12.
*/