diff --git a/app/build.gradle b/app/build.gradle index 3d95ca69..27ff3966 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 208 - versionName "3.0.0 Alpha9" + versionCode 209 + versionName "3.0.0 Alpha10" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { @@ -82,9 +82,6 @@ dependencies { debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5' releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5' - // Storio (Sqlite api library) - annotationProcessor 'com.pushtorefresh.storio:sqlite-annotations-processor:1.12.3' - compile 'com.pushtorefresh.storio:sqlite-annotations:1.12.3' // Android Annotations annotationProcessor "org.androidannotations:androidannotations:$AAVersion" compile "org.androidannotations:androidannotations-api:$AAVersion" diff --git a/app/src/androidTest/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorageTest.java b/app/src/androidTest/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorageTest.java deleted file mode 100644 index 4366b90f..00000000 --- a/app/src/androidTest/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorageTest.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.stardust.scriptdroid.statics; - -import android.support.test.InstrumentationRegistry; - -import com.stardust.autojs.script.JavaScriptFileSource; -import com.stardust.autojs.script.ScriptSource; -import com.stardust.autojs.script.StringScriptSource; -import com.stardust.util.MapEntries; - -import org.junit.Before; -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Created by Stardust on 2017/5/5. - */ -public class SQLiteStaticsStorageTest { - - - private SQLiteStaticsStorage mStorage; - - @Before - public void setUp() throws Exception { - mStorage = new SQLiteStaticsStorage(InstrumentationRegistry.getTargetContext()); - } - - @Test - public void record() throws Exception { - testOneRecord(); - testTwoRecord(); - testRepeatedRecord(); - } - - - @Test - public void testOneRecord() { - mStorage.clear(); - mStorage.record(new StringScriptSource("Name", "Script")); - assertEquals(mStorage.getAll(), new MapEntries() - .entry("Name.js", "1") - .map()); - } - - @Test - public void testTwoRecord() { - mStorage.clear(); - mStorage.record(new StringScriptSource("Name", "Script")); - mStorage.record(new JavaScriptFileSource("/test/test.js")); - assertEquals(mStorage.getAll(), new MapEntries() - .entry("Name.js", "1") - .entry("/test/test.js", "1") - .map()); - } - - @Test - public void testRepeatedRecord() { - mStorage.clear(); - mStorage.record(new JavaScriptFileSource("/test/test.js")); - mStorage.record(new StringScriptSource("Name", "Script")); - mStorage.record(new JavaScriptFileSource("/test/test.js")); - mStorage.record(new JavaScriptFileSource("/test/test.js")); - assertEquals(mStorage.getAll(), new MapEntries() - .entry("Name.js", "1") - .entry("/test/test.js", "3") - .map()); - } - - - @Test - public void getMax() throws Exception { - mStorage.clear(); - put(new JavaScriptFileSource("/test/test.js"), 50); - put(new StringScriptSource("Name4", "Script"), 10); - put(new StringScriptSource("Name5", "Script"), 5); - put(new StringScriptSource("Name6", "Script"), 4); - put(new StringScriptSource("Name7", "Script"), 3); - put(new StringScriptSource("Name8", "Script"), 1); - put(new StringScriptSource("Name9", "Script"), 1); - put(new StringScriptSource("Name3", "Script"), 20); - put(new StringScriptSource("Name1", "Script"), 100); - assertEquals(mStorage.getMax(5), new MapEntries() - .entry("Name1.js", "100") - .entry("/test/test.js", "50") - .entry("Name3.js", "20") - .entry("Name4.js", "10") - .entry("Name5.js", "5") - .map()); - } - - private void put(ScriptSource source, int times) { - for (int i = 0; i < times; i++) { - mStorage.record(source); - } - } - -} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c33125ac..3a7457a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -99,7 +99,6 @@ - diff --git a/app/src/main/java/com/stardust/scriptdroid/App.java b/app/src/main/java/com/stardust/scriptdroid/App.java index 039207d8..b27676dd 100644 --- a/app/src/main/java/com/stardust/scriptdroid/App.java +++ b/app/src/main/java/com/stardust/scriptdroid/App.java @@ -1,29 +1,18 @@ package com.stardust.scriptdroid; -import android.app.Activity; -import android.app.Application; -import android.content.IntentFilter; -import android.os.Bundle; import android.support.multidex.MultiDexApplication; -import android.view.KeyEvent; +import com.flurry.android.FlurryAgent; import com.squareup.leakcanary.LeakCanary; -import com.stardust.app.SimpleActivityLifecycleCallbacks; -import com.stardust.app.VolumeChangeObserver; import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.autojs.key.GlobalKeyObserver; import com.stardust.scriptdroid.autojs.record.GlobalRecorder; -import com.stardust.scriptdroid.statics.ScriptStatics; import com.stardust.scriptdroid.tool.CrashHandler; import com.stardust.scriptdroid.tool.JsBeautifierFactory; -import com.stardust.scriptdroid.tool.Logcat; import com.stardust.scriptdroid.ui.error.ErrorReportActivity; import com.stardust.theme.ThemeColor; import com.stardust.theme.ThemeColorManager; -import com.stardust.util.ScreenMetrics; import com.stardust.util.UiHandler; -import com.stardust.view.accessibility.AccessibilityService; -import com.stardust.view.accessibility.OnKeyListener; import java.lang.ref.WeakReference; @@ -52,7 +41,9 @@ public class App extends MultiDexApplication { } private void setUpStaticsTool() { - ScriptStatics.init(this); + new FlurryAgent.Builder() + .withLogEnabled(BuildConfig.DEBUG) + .build(this, "D42MH48ZN4PJC5TKNYZD"); } diff --git a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java index 4e9a4fb3..78df8d0a 100644 --- a/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java +++ b/app/src/main/java/com/stardust/scriptdroid/autojs/AutoJs.java @@ -39,7 +39,6 @@ import com.stardust.autojs.core.record.accessibility.AccessibilityActionRecorder import com.stardust.view.accessibility.AccessibilityService; import com.stardust.scriptdroid.tool.AccessibilityServiceTool; import com.stardust.scriptdroid.ui.console.JraskaConsole; -import com.stardust.view.accessibility.AccessibilityServiceUtils; import com.stardust.view.accessibility.LayoutInspector; import com.stardust.view.accessibility.NotificationListener; diff --git a/app/src/main/java/com/stardust/scriptdroid/autojs/ScriptExecutionGlobalListener.java b/app/src/main/java/com/stardust/scriptdroid/autojs/ScriptExecutionGlobalListener.java index cd56a2c8..18b2076e 100644 --- a/app/src/main/java/com/stardust/scriptdroid/autojs/ScriptExecutionGlobalListener.java +++ b/app/src/main/java/com/stardust/scriptdroid/autojs/ScriptExecutionGlobalListener.java @@ -5,7 +5,6 @@ import com.stardust.autojs.execution.ScriptExecution; import com.stardust.autojs.execution.ScriptExecutionListener; import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.R; -import com.stardust.scriptdroid.statics.ScriptStatics; /** * Created by Stardust on 2017/5/3. @@ -17,7 +16,6 @@ public class ScriptExecutionGlobalListener implements ScriptExecutionListener { @Override public void onStart(ScriptExecution execution) { execution.getEngine().setTag(ENGINE_TAG_START_TIME, System.currentTimeMillis()); - ScriptStatics.recordScript(execution.getSource()); } @Override diff --git a/app/src/main/java/com/stardust/scriptdroid/autojs/record/GlobalRecorder.java b/app/src/main/java/com/stardust/scriptdroid/autojs/record/GlobalRecorder.java index f80175ff..a9edd292 100644 --- a/app/src/main/java/com/stardust/scriptdroid/autojs/record/GlobalRecorder.java +++ b/app/src/main/java/com/stardust/scriptdroid/autojs/record/GlobalRecorder.java @@ -4,22 +4,18 @@ import android.content.Context; import android.os.Looper; import android.support.annotation.NonNull; import android.view.ContextThemeWrapper; -import android.view.KeyEvent; import android.view.View; import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.app.DialogUtils; -import com.stardust.autojs.core.inputevent.InputEventCodes; -import com.stardust.autojs.core.inputevent.ShellKeyObserver; import com.stardust.autojs.core.record.Recorder; import com.stardust.autojs.core.record.accessibility.AccessibilityActionRecorder; import com.stardust.autojs.core.record.inputevent.InputEventRecorder; import com.stardust.autojs.core.record.inputevent.InputEventToAutoFileRecorder; import com.stardust.autojs.core.record.inputevent.InputEventToRootAutomatorRecorder; import com.stardust.autojs.core.record.inputevent.TouchRecorder; -import com.stardust.autojs.runtime.api.Shell; import com.stardust.scriptdroid.App; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; @@ -28,8 +24,6 @@ import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.ui.common.ScriptOperations; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; import com.stardust.util.ClipboardUtil; -import com.stardust.view.accessibility.AccessibilityService; -import com.stardust.view.accessibility.OnKeyListener; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/app/src/main/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorage.java b/app/src/main/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorage.java deleted file mode 100644 index f8b37cf8..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/statics/SQLiteStaticsStorage.java +++ /dev/null @@ -1,139 +0,0 @@ -package com.stardust.scriptdroid.statics; - -import android.content.Context; -import android.database.sqlite.SQLiteDatabase; - -import com.pushtorefresh.storio.sqlite.SQLiteTypeMapping; -import com.pushtorefresh.storio.sqlite.StorIOSQLite; -import com.pushtorefresh.storio.sqlite.impl.DefaultStorIOSQLite; -import com.pushtorefresh.storio.sqlite.queries.DeleteQuery; -import com.pushtorefresh.storio.sqlite.queries.Query; -import com.stardust.autojs.script.ScriptSource; - -import java.io.IOException; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created by Stardust on 2017/5/5. - */ - -public class SQLiteStaticsStorage implements ScriptStaticsStorage { - - private static final int VERSION = 1; - private static final String DATABASE_NAME = "Ever.db"; - static final String TABLE_NAME = "FinalEating"; - - private StorIOSQLite mStorIOSQLite; - - public SQLiteStaticsStorage(Context context) { - mStorIOSQLite = DefaultStorIOSQLite.builder() - .sqliteOpenHelper(new SQLiteOpenHelper(context)) - .addTypeMapping(ScriptStaticsRecord.class, new ScriptStaticsRecordSQLiteTypeMapping()) - .build(); - } - - @Override - public void record(ScriptSource source) { - int times = getTimes(source) + 1; - mStorIOSQLite.put() - .object(new ScriptStaticsRecord(source.toString(), times)) - .prepare() - .executeAsBlocking(); - - } - - public int getTimes(ScriptSource source) { - ScriptStaticsRecord record = mStorIOSQLite.get() - .object(ScriptStaticsRecord.class) - .withQuery(Query.builder() - .table(TABLE_NAME) - .where("name = ?") - .whereArgs(source.toString()) - .build()) - .prepare() - .executeAsBlocking(); - if (record != null) { - return record.times; - } else { - return 0; - } - } - - @Override - public Map getAll() { - List records = mStorIOSQLite.get() - .listOfObjects(ScriptStaticsRecord.class) - .withQuery(Query.builder() - .table(TABLE_NAME) - .orderBy("times") - .build()) - .prepare() - .executeAsBlocking(); - return toMap(records); - } - - private Map toMap(List records) { - Map map = new HashMap<>(); - for (ScriptStaticsRecord record : records) { - map.put(record.name, String.valueOf(record.times)); - } - return map; - } - - @Override - public Map getMax(int size) { - List records = mStorIOSQLite.get() - .listOfObjects(ScriptStaticsRecord.class) - .withQuery(Query.builder() - .table(TABLE_NAME) - .orderBy("times DESC") - .limit(size) - .build()) - .prepare() - .executeAsBlocking(); - return toMap(records); - } - - @Override - public void clear() { - mStorIOSQLite.delete() - .byQuery(DeleteQuery.builder() - .table(TABLE_NAME) - .build()) - .prepare() - .executeAsBlocking(); - } - - @Override - public void close() { - try { - mStorIOSQLite.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - - private static class SQLiteOpenHelper extends android.database.sqlite.SQLiteOpenHelper { - - SQLiteOpenHelper(Context context) { - super(context, DATABASE_NAME, null, VERSION); - } - - @Override - public void onCreate(SQLiteDatabase db) { - db.execSQL("CREATE TABLE IF NOT EXISTS " + TABLE_NAME + "(\n" - + "name TEXT NOT NULL PRIMARY KEY, " - + "times INTEGER" - + ");"); - } - - @Override - public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) { - - } - } - - -} diff --git a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStatics.java b/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStatics.java deleted file mode 100644 index 59e78189..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStatics.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.stardust.scriptdroid.statics; - -import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.text.format.DateUtils; - -import com.flurry.android.FlurryAgent; -import com.stardust.autojs.script.ScriptSource; -import com.stardust.scriptdroid.BuildConfig; - -/** - * Created by Stardust on 2017/5/5. - */ - -public class ScriptStatics { - - - private static final String KEY_MILLIS = "Sorry, I should have left"; - private static ScriptStaticsStorage storage; - private static SharedPreferences preferences; - - public static void init(Context context) { - storage = new SQLiteStaticsStorage(context); - new FlurryAgent.Builder() - .withLogEnabled(BuildConfig.DEBUG) - .build(context, "D42MH48ZN4PJC5TKNYZD"); - preferences = PreferenceManager.getDefaultSharedPreferences(context); - } - - public static void recordScript(ScriptSource source) { - storage.record(source); - sendStaticsIfNeeded(); - } - - private static void sendStaticsIfNeeded() { - long millis = preferences.getLong(KEY_MILLIS, 0); - if (!DateUtils.isToday(millis)) { - preferences.edit().putLong(KEY_MILLIS, System.currentTimeMillis()).apply(); - FlurryAgent.logEvent("ScriptStatics", storage.getMax(10)); - } - } - - @Override - protected void finalize() throws Throwable { - super.finalize(); - storage.close(); - } -} diff --git a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsRecord.java b/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsRecord.java deleted file mode 100644 index cf3c217c..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsRecord.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.stardust.scriptdroid.statics; - -import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteColumn; -import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteCreator; -import com.pushtorefresh.storio.sqlite.annotations.StorIOSQLiteType; - -/** - * Created by Stardust on 2017/5/5. - */ - -@StorIOSQLiteType(table = SQLiteStaticsStorage.TABLE_NAME) -public class ScriptStaticsRecord { - - @StorIOSQLiteColumn(name = "name", key = true) - public String name; - - @StorIOSQLiteColumn(name = "times") - public int times; - - public ScriptStaticsRecord(String name, int times) { - this.name = name; - this.times = times; - } - - public ScriptStaticsRecord() { - } -} diff --git a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsStorage.java b/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsStorage.java deleted file mode 100644 index 99b2d82b..00000000 --- a/app/src/main/java/com/stardust/scriptdroid/statics/ScriptStaticsStorage.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.stardust.scriptdroid.statics; - -import com.stardust.autojs.script.ScriptSource; - -import java.util.Map; - -/** - * Created by Stardust on 2017/5/5. - */ - -public interface ScriptStaticsStorage { - - void record(ScriptSource source); - - Map getAll(); - - Map getMax(int size); - - void clear(); - - void close(); -} diff --git a/app/src/main/java/com/stardust/app/NotAskAgainDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/common/NotAskAgainDialog.java similarity index 97% rename from app/src/main/java/com/stardust/app/NotAskAgainDialog.java rename to app/src/main/java/com/stardust/scriptdroid/ui/common/NotAskAgainDialog.java index 6398ca1b..edd400f4 100644 --- a/app/src/main/java/com/stardust/app/NotAskAgainDialog.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/common/NotAskAgainDialog.java @@ -1,4 +1,4 @@ -package com.stardust.app; +package com.stardust.scriptdroid.ui.common; import android.content.Context; import android.preference.PreferenceManager; diff --git a/app/src/main/java/com/stardust/app/OperationDialogBuilder.java b/app/src/main/java/com/stardust/scriptdroid/ui/common/OperationDialogBuilder.java similarity index 99% rename from app/src/main/java/com/stardust/app/OperationDialogBuilder.java rename to app/src/main/java/com/stardust/scriptdroid/ui/common/OperationDialogBuilder.java index df9fb8cf..3a42f0fc 100644 --- a/app/src/main/java/com/stardust/app/OperationDialogBuilder.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/common/OperationDialogBuilder.java @@ -90,4 +90,4 @@ public class OperationDialogBuilder extends MaterialDialog.Builder { } } -} +} \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptLoopDialog.java b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptLoopDialog.java index 5251d147..63f75cdc 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptLoopDialog.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptLoopDialog.java @@ -5,7 +5,6 @@ import android.support.annotation.NonNull; import android.support.design.widget.TextInputEditText; import android.view.View; import android.view.Window; -import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java index 83ba0344..b1f2a6c5 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/common/ScriptOperations.java @@ -21,7 +21,6 @@ import com.stardust.scriptdroid.script.ScriptFile; import com.stardust.scriptdroid.script.Scripts; import com.stardust.scriptdroid.script.StorageFileProvider; import com.stardust.scriptdroid.script.sample.Sample; -import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; import org.reactivestreams.Publisher; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java index fc6124d9..5a029e58 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/floating/CircularMenu.java @@ -23,13 +23,11 @@ import com.stardust.scriptdroid.script.ScriptFile; import com.stardust.scriptdroid.tool.AccessibilityServiceTool; import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutBoundsFloatyWindow; import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutHierarchyFloatyWindow; -import com.stardust.scriptdroid.ui.floating.layoutinspector.LayoutHierarchyView; import com.stardust.scriptdroid.ui.main.scripts.ScriptListView; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; import com.stardust.util.ClipboardUtil; import com.stardust.view.accessibility.LayoutInspector; -import org.androidannotations.annotations.Click; import org.greenrobot.eventbus.EventBus; import butterknife.ButterKnife; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java index e499311b..a5ae3ffa 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/MainActivity.java @@ -18,7 +18,6 @@ import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.qq.e.comm.DownloadService; import com.stardust.app.FragmentPagerAdapterBuilder; -import com.stardust.app.NotAskAgainDialog; import com.stardust.app.OnActivityResultDelegate; import com.stardust.enhancedfloaty.FloatyService; import com.stardust.pio.PFile; @@ -26,6 +25,7 @@ import com.stardust.scriptdroid.BuildConfig; import com.stardust.scriptdroid.Pref; import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.autojs.AutoJs; +import com.stardust.scriptdroid.ui.common.NotAskAgainDialog; import com.stardust.scriptdroid.ui.floating.FloatyWindowManger; import com.stardust.scriptdroid.script.StorageFileProvider; import com.stardust.scriptdroid.ui.main.community.CommunityFragment_; diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java index 1345544a..42ff9a4b 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/drawer/DrawerFragment.java @@ -290,7 +290,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment { } @Subscribe - void onCircularMenuStateChange(CircularMenu.StateChangeEvent event) { + public void onCircularMenuStateChange(CircularMenu.StateChangeEvent event) { mFloatingWindowItem.getSwitchCompat().setChecked(event.getCurrentState() != CircularMenu.STATE_CLOSED); } diff --git a/app/src/main/res/anim/item_hover.xml b/app/src/main/res/anim/item_hover.xml deleted file mode 100644 index 1110605d..00000000 --- a/app/src/main/res/anim/item_hover.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-hdpi/ic_exit.png b/app/src/main/res/drawable-hdpi/ic_exit.png deleted file mode 100644 index 79904a43..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_exit.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_loop_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_loop_white_24dp.png deleted file mode 100644 index f0072e11..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_loop_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png deleted file mode 100644 index 644b9884..00000000 Binary files a/app/src/main/res/drawable-hdpi/ic_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_exit.png b/app/src/main/res/drawable-mdpi/ic_exit.png deleted file mode 100644 index aa4ade93..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_exit.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_loop_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_loop_white_24dp.png deleted file mode 100644 index 92cf0a71..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_loop_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png deleted file mode 100644 index 61dab039..00000000 Binary files a/app/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_exit.png b/app/src/main/res/drawable-xhdpi/ic_exit.png deleted file mode 100644 index cda15079..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_exit.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_loop_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_loop_white_24dp.png deleted file mode 100644 index 7a7a771e..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_loop_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png deleted file mode 100644 index f96e0c73..00000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/background.jpg b/app/src/main/res/drawable-xxhdpi/background.jpg deleted file mode 100644 index 077edae9..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/background.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_exit.png b/app/src/main/res/drawable-xxhdpi/ic_exit.png deleted file mode 100644 index 24e0bcd9..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_exit.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_loop_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_loop_white_24dp.png deleted file mode 100644 index be061bfe..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_loop_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png deleted file mode 100644 index ef4ae1c4..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_exit.png b/app/src/main/res/drawable-xxxhdpi/ic_exit.png deleted file mode 100644 index 04dfb5ce..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_exit.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_loop_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_loop_white_24dp.png deleted file mode 100644 index f8b12771..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_loop_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_settings.png b/app/src/main/res/drawable-xxxhdpi/ic_settings.png deleted file mode 100644 index 1c69e5c4..00000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable/background_splash.xml b/app/src/main/res/drawable/background_splash.xml deleted file mode 100644 index 33fc2126..00000000 --- a/app/src/main/res/drawable/background_splash.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/card_shadow.xml b/app/src/main/res/drawable/card_shadow.xml deleted file mode 100644 index a8e0dad0..00000000 --- a/app/src/main/res/drawable/card_shadow.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/chartjs.png b/app/src/main/res/drawable/chartjs.png deleted file mode 100644 index 000c7444..00000000 Binary files a/app/src/main/res/drawable/chartjs.png and /dev/null differ diff --git a/app/src/main/res/drawable/circle_white.xml b/app/src/main/res/drawable/circle_white.xml deleted file mode 100644 index 50194cc2..00000000 --- a/app/src/main/res/drawable/circle_white.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/discard.png b/app/src/main/res/drawable/discard.png deleted file mode 100644 index cdc318b0..00000000 Binary files a/app/src/main/res/drawable/discard.png and /dev/null differ diff --git a/app/src/main/res/drawable/divider.xml b/app/src/main/res/drawable/divider.xml deleted file mode 100644 index dcf30bcf..00000000 --- a/app/src/main/res/drawable/divider.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/floating_menu_divider.xml b/app/src/main/res/drawable/floating_menu_divider.xml deleted file mode 100644 index 0fb65a8b..00000000 --- a/app/src/main/res/drawable/floating_menu_divider.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_file.png b/app/src/main/res/drawable/ic_add_file.png deleted file mode 100644 index a13454ed..00000000 Binary files a/app/src/main/res/drawable/ic_add_file.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_delete.png b/app/src/main/res/drawable/ic_ali_delete.png deleted file mode 100644 index b092a3a4..00000000 Binary files a/app/src/main/res/drawable/ic_ali_delete.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_open.png b/app/src/main/res/drawable/ic_ali_open.png deleted file mode 100644 index 4c8f9ec2..00000000 Binary files a/app/src/main/res/drawable/ic_ali_open.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_rename.png b/app/src/main/res/drawable/ic_ali_rename.png deleted file mode 100644 index 5de9ddbb..00000000 Binary files a/app/src/main/res/drawable/ic_ali_rename.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_ali_shortcut.png b/app/src/main/res/drawable/ic_ali_shortcut.png deleted file mode 100644 index 24d705bf..00000000 Binary files a/app/src/main/res/drawable/ic_ali_shortcut.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_android_eat_js_64.png b/app/src/main/res/drawable/ic_android_eat_js_64.png deleted file mode 100644 index a3dc653c..00000000 Binary files a/app/src/main/res/drawable/ic_android_eat_js_64.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_console_green.png b/app/src/main/res/drawable/ic_console_green.png deleted file mode 100644 index 40567b9c..00000000 Binary files a/app/src/main/res/drawable/ic_console_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_edit_gray.png b/app/src/main/res/drawable/ic_edit_gray.png deleted file mode 100644 index ad547e73..00000000 Binary files a/app/src/main/res/drawable/ic_edit_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_edit_white.png b/app/src/main/res/drawable/ic_edit_white.png deleted file mode 100644 index 760e1e33..00000000 Binary files a/app/src/main/res/drawable/ic_edit_white.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_function_mathematical_green.png b/app/src/main/res/drawable/ic_function_mathematical_green.png deleted file mode 100644 index 3fb865a4..00000000 Binary files a/app/src/main/res/drawable/ic_function_mathematical_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_js.png b/app/src/main/res/drawable/ic_js.png deleted file mode 100644 index f63ec228..00000000 Binary files a/app/src/main/res/drawable/ic_js.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_more_gray.png b/app/src/main/res/drawable/ic_more_gray.png deleted file mode 100644 index e143153f..00000000 Binary files a/app/src/main/res/drawable/ic_more_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_new_directory.png b/app/src/main/res/drawable/ic_new_directory.png deleted file mode 100644 index 9b0a3805..00000000 Binary files a/app/src/main/res/drawable/ic_new_directory.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.png b/app/src/main/res/drawable/ic_pause_white_24dp.png deleted file mode 100644 index f49aed75..00000000 Binary files a/app/src/main/res/drawable/ic_pause_white_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_play_arrow_black_24dp.png b/app/src/main/res/drawable/ic_play_arrow_black_24dp.png deleted file mode 100644 index f208795f..00000000 Binary files a/app/src/main/res/drawable/ic_play_arrow_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_rename_gray.png b/app/src/main/res/drawable/ic_rename_gray.png deleted file mode 100644 index 209b7a5f..00000000 Binary files a/app/src/main/res/drawable/ic_rename_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_robot_head_green.png b/app/src/main/res/drawable/ic_robot_head_green.png deleted file mode 100644 index f509a6cb..00000000 Binary files a/app/src/main/res/drawable/ic_robot_head_green.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_share_black_24dp.png b/app/src/main/res/drawable/ic_share_black_24dp.png deleted file mode 100644 index 81c80b70..00000000 Binary files a/app/src/main/res/drawable/ic_share_black_24dp.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_share_gray.png b/app/src/main/res/drawable/ic_share_gray.png deleted file mode 100644 index 7a3fab2b..00000000 Binary files a/app/src/main/res/drawable/ic_share_gray.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_speech_bubble.png b/app/src/main/res/drawable/ic_speech_bubble.png deleted file mode 100644 index f798c8c7..00000000 Binary files a/app/src/main/res/drawable/ic_speech_bubble.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_stop_white_36pt.png b/app/src/main/res/drawable/ic_stop_white_36pt.png deleted file mode 100644 index dfff26ce..00000000 Binary files a/app/src/main/res/drawable/ic_stop_white_36pt.png and /dev/null differ diff --git a/app/src/main/res/drawable/instantiation_patterns_featured.png b/app/src/main/res/drawable/instantiation_patterns_featured.png deleted file mode 100644 index 39d9baf7..00000000 Binary files a/app/src/main/res/drawable/instantiation_patterns_featured.png and /dev/null differ diff --git a/app/src/main/res/drawable/profile_bg.png b/app/src/main/res/drawable/profile_bg.png deleted file mode 100644 index 2fbca8af..00000000 Binary files a/app/src/main/res/drawable/profile_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/record_icon_18.png b/app/src/main/res/drawable/record_icon_18.png deleted file mode 100644 index f8e4c264..00000000 Binary files a/app/src/main/res/drawable/record_icon_18.png and /dev/null differ diff --git a/app/src/main/res/drawable/toolbar_bg.jpg b/app/src/main/res/drawable/toolbar_bg.jpg deleted file mode 100644 index 8c8d9dee..00000000 Binary files a/app/src/main/res/drawable/toolbar_bg.jpg and /dev/null differ diff --git a/app/src/main/res/layout/floating_script_list_recycler_view_directory.xml b/app/src/main/res/layout/floating_script_list_recycler_view_directory.xml deleted file mode 100644 index c28caf2b..00000000 --- a/app/src/main/res/layout/floating_script_list_recycler_view_directory.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/floating_script_list_recycler_view_file.xml b/app/src/main/res/layout/floating_script_list_recycler_view_file.xml deleted file mode 100644 index 1d001bce..00000000 --- a/app/src/main/res/layout/floating_script_list_recycler_view_file.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_main_menu.xml b/app/src/main/res/layout/floating_window_main_menu.xml deleted file mode 100644 index 652a849b..00000000 --- a/app/src/main/res/layout/floating_window_main_menu.xml +++ /dev/null @@ -1,117 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_record.xml b/app/src/main/res/layout/floating_window_record.xml deleted file mode 100644 index d83022a5..00000000 --- a/app/src/main/res/layout/floating_window_record.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_record_pause.xml b/app/src/main/res/layout/floating_window_record_pause.xml deleted file mode 100644 index 4583d64e..00000000 --- a/app/src/main/res/layout/floating_window_record_pause.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/floating_window_record_start.xml b/app/src/main/res/layout/floating_window_record_start.xml deleted file mode 100644 index 33321750..00000000 --- a/app/src/main/res/layout/floating_window_record_start.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_help_side_menu.xml b/app/src/main/res/layout/fragment_help_side_menu.xml deleted file mode 100644 index b049be0e..00000000 --- a/app/src/main/res/layout/fragment_help_side_menu.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_sample_script_list.xml b/app/src/main/res/layout/fragment_sample_script_list.xml deleted file mode 100644 index 7a89e32f..00000000 --- a/app/src/main/res/layout/fragment_sample_script_list.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/function_list_recycler_view_item.xml b/app/src/main/res/layout/function_list_recycler_view_item.xml deleted file mode 100644 index 3821dc3d..00000000 --- a/app/src/main/res/layout/function_list_recycler_view_item.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml deleted file mode 100644 index 7cebf6c5..00000000 --- a/app/src/main/res/layout/nav_header.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/layout/new_file_dialog.xml b/app/src/main/res/layout/new_file_dialog.xml deleted file mode 100644 index 1624c434..00000000 --- a/app/src/main/res/layout/new_file_dialog.xml +++ /dev/null @@ -1,119 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -