tt/AutoJs6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化 编辑文件的多任务体验

Browse Source
This commit is contained in:
hyb1996
2019-01-23 11:37:45 +08:00
parent ce5447859a
commit 3fecfa9ccb
10 changed files with 50 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@@ -5,7 +5,7 @@
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_SedTORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
<uses-permission android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"/>
@@ -84,6 +84,7 @@
<activity
android:name=".ui.edit.EditActivity_"
android:configChanges="orientation|screenSize"
android:launchMode="standard"
android:multiprocess="true"
android:taskAffinity="org.autojs.autojs.edit"
android:theme="@style/EditorTheme">

6
app/src/main/java/org/autojs/autojs/external/open/EditIntentActivity.java vendored
View File

@@ -5,7 +5,9 @@ import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import androidx.annotation.Nullable;
import android.text.TextUtils;
import android.widget.Toast;
@@ -56,9 +58,9 @@ public class EditIntentActivity extends BaseActivity {
}
}
if (!TextUtils.isEmpty(path)) {
EditActivity.editFile(this, path);
EditActivity.editFile(this, path, false);
} else {
EditActivity.editFile(this, uri);
EditActivity.editFile(this, uri, false);
}
}
}

2
app/src/main/java/org/autojs/autojs/model/script/Scripts.kt
View File

@@ -92,7 +92,7 @@ object Scripts {
fun edit(context: Context, file: ScriptFile) {
EditActivity.editFile(context, file.simplifiedName, file.path)
EditActivity.editFile(context, file.simplifiedName, file.path, true)
}
fun edit(context: Context, path: String) {

48
app/src/main/java/org/autojs/autojs/ui/edit/EditActivity.java
View File

@@ -1,6 +1,7 @@
package org.autojs.autojs.ui.edit;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
@@ -31,6 +32,7 @@ import org.autojs.autojs.theme.dialog.ThemeColorMaterialDialogBuilder;
import org.androidannotations.annotations.AfterViews;
import org.androidannotations.annotations.EActivity;
import org.androidannotations.annotations.ViewById;
import org.autojs.autojs.ui.main.MainActivity_;
import java.io.File;
import java.io.IOException;
@@ -56,35 +58,46 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
@ViewById(R.id.editor_view)
EditorView mEditorView;
private EditorMenu mEditorMenu;
private RequestPermissionCallbacks mRequestPermissionCallbacks = new RequestPermissionCallbacks();
private boolean mNewTask;
public static void editFile(Context context, String path) {
editFile(context, null, path);
public static void editFile(Context context, String path, boolean newTask) {
editFile(context, null, path, newTask);
}
public static void editFile(Context context, Uri uri) {
context.startActivity(new Intent(context, EditActivity_.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
public static void editFile(Context context, Uri uri, boolean newTask) {
context.startActivity(newIntent(context, newTask)
.setData(uri));
}
public static void editFile(Context context, String name, String path) {
context.startActivity(new Intent(context, EditActivity_.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
public static void editFile(Context context, String name, String path, boolean newTask) {
context.startActivity(newIntent(context, newTask)
.putExtra(EXTRA_PATH, path)
.putExtra(EXTRA_NAME, name));
}
public static void viewContent(Context context, String name, String content) {
context.startActivity(new Intent(context, EditActivity_.class)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
public static void viewContent(Context context, String name, String content, boolean newTask) {
context.startActivity(newIntent(context, newTask)
.putExtra(EXTRA_CONTENT, content)
.putExtra(EXTRA_NAME, name)
.putExtra(EXTRA_READ_ONLY, true));
}
private static Intent newIntent(Context context, boolean newTask) {
Intent intent = new Intent(context, EditActivity_.class);
if (newTask || !(context instanceof Activity)) {
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
return intent;
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
mNewTask = (getIntent().getFlags() & Intent.FLAG_ACTIVITY_NEW_TASK) != 0;
}
@SuppressLint("CheckResult")
@AfterViews
void setUpViews() {
@@ -142,14 +155,6 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
return super.onPrepareOptionsMenu(menu);
}
public boolean onPrepareActionMode(Menu menu) {
Log.d(LOG_TAG, "onPrepareActionMode: " + menu);
boolean isScriptRunning = mEditorView.getScriptExecutionId() != ScriptExecution.NO_ID;
MenuItem forceStopItem = menu.findItem(R.id.action_force_stop);
forceStopItem.setEnabled(isScriptRunning);
return super.onPrepareOptionsMenu(menu);
}
@Override
public void onActionModeStarted(ActionMode mode) {
Log.d(LOG_TAG, "onActionModeStarted: " + mode);
@@ -207,6 +212,9 @@ public class EditActivity extends BaseActivity implements OnActivityResultDelega
} else {
finish();
}
if (mNewTask) {
startActivity(new Intent(this, MainActivity_.class));
}
}
private void showExitConfirmDialog() {

15
app/src/main/java/org/autojs/autojs/ui/edit/ViewSampleActivity.java
View File

@@ -5,8 +5,11 @@ import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.Bundle;
import com.google.android.material.snackbar.Snackbar;
import androidx.appcompat.app.AppCompatActivity;
import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuItem;
@@ -15,13 +18,16 @@ import android.view.View;
import com.stardust.app.OnActivityResultDelegate;
import com.stardust.autojs.engine.JavaScriptEngine;
import com.stardust.autojs.execution.ScriptExecution;
import org.autojs.autojs.R;
import org.autojs.autojs.autojs.AutoJs;
import org.autojs.autojs.model.sample.SampleFile;
import org.autojs.autojs.ui.BaseActivity;
import org.autojs.autojs.ui.common.ScriptOperations;
import com.stardust.theme.ThemeColorManager;
import com.stardust.util.SparseArrayEntries;
import org.autojs.autojs.ui.widget.ToolbarMenuItem;
import butterknife.ButterKnife;
@@ -99,12 +105,9 @@ public class ViewSampleActivity extends AppCompatActivity implements OnActivityR
new ScriptOperations(this, mView)
.importSample(mSample)
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new Consumer<String>() {
@Override
public void accept(@NonNull String path) throws Exception {
EditActivity.editFile(ViewSampleActivity.this, path);
finish();
}
.subscribe(path -> {
EditActivity.editFile(ViewSampleActivity.this, path, false);
finish();
});
}

7
app/src/main/java/org/autojs/autojs/ui/main/MainActivity.java
View File

@@ -4,7 +4,9 @@ import android.Manifest;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.Bundle;
import androidx.annotation.NonNull;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.core.view.GravityCompat;
@@ -65,7 +67,6 @@ import java.util.Arrays;
@EActivity(R.layout.activity_main)
public class MainActivity extends BaseActivity implements OnActivityResultDelegate.DelegateHost, BackPressedHandler.HostActivity, PermissionRequestProxyActivity {
public static class DrawerOpenEvent {
static DrawerOpenEvent SINGLETON = new DrawerOpenEvent();
}
@@ -138,7 +139,7 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
}
private void checkPermissions() {
checkPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
checkPermission(Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE);
}
private void showAccessibilitySettingPromptIfDisabled() {
@@ -180,8 +181,6 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega
}
private void setUpViewPagerFragmentBehaviors() {
mPagerAdapter.setOnFragmentInstantiateListener((pos, fragment) -> {
((ViewPagerFragment) fragment).setFab(mFab);
if (pos == mViewPager.getCurrentItem()) {