From e8110c76a21159d0485483ad91618d2aae956e8a Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Thu, 2 Nov 2017 00:39:31 +0800 Subject: [PATCH] move LOG from tab TASK to action menu --- app/build.gradle | 4 +- app/src/main/AndroidManifest.xml | 39 +++---- .../scriptdroid/ui/edit/EditorMenu.java | 3 +- .../scriptdroid/ui/log/LogActivity.java | 40 +++++++ .../scriptdroid/ui/main/MainActivity.java | 10 ++ .../ui/main/task/TaskManagerFragment.java | 65 +----------- .../res/drawable-hdpi/ic_clear_white_48dp.png | Bin 0 -> 347 bytes .../res/drawable-mdpi/ic_clear_white_48dp.png | Bin 0 -> 257 bytes .../main/res/drawable-xhdpi/ic_ali_log.png | Bin 0 -> 1135 bytes .../drawable-xhdpi/ic_clear_white_48dp.png | Bin 0 -> 436 bytes .../drawable-xxhdpi/ic_clear_white_48dp.png | Bin 0 -> 524 bytes .../drawable-xxxhdpi/ic_clear_white_48dp.png | Bin 0 -> 702 bytes app/src/main/res/layout/activity_log.xml | 43 ++++++++ .../main/res/layout/fragment_task_manager.xml | 100 +++++------------- app/src/main/res/menu/menu_main.xml | 6 ++ app/src/main/res/values/dimens.xml | 1 + app/src/main/res/values/strings.xml | 1 + 17 files changed, 144 insertions(+), 168 deletions(-) create mode 100644 app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java create mode 100644 app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png create mode 100644 app/src/main/res/drawable-mdpi/ic_clear_white_48dp.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_ali_log.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_clear_white_48dp.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png create mode 100644 app/src/main/res/layout/activity_log.xml diff --git a/app/build.gradle b/app/build.gradle index b84b0168..7d4b2294 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.stardust.scriptdroid" minSdkVersion 17 targetSdkVersion 23 - versionCode 217 - versionName "3.0.0 Alpha17" + versionCode 218 + versionName "3.0.0 Alpha18" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" multiDexEnabled true ndk { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index db3e1dee..0379d4f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ @@ -14,7 +15,6 @@ - - - + @@ -42,16 +41,14 @@ android:label="@string/_app_name" android:launchMode="singleTask" android:theme="@style/AppTheme.FullScreen"> - - - + @@ -69,7 +66,6 @@ - + - - - + - @@ -135,12 +129,10 @@ - - @@ -153,9 +145,7 @@ - - - - - - @@ -191,7 +177,6 @@ - @@ -200,18 +185,17 @@ + - - + @@ -234,10 +219,10 @@ + - \ No newline at end of file diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java index 4013bef4..63fb4cd8 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/edit/EditorMenu.java @@ -11,6 +11,7 @@ import com.stardust.scriptdroid.R; import com.stardust.scriptdroid.autojs.AutoJs; import com.stardust.scriptdroid.ui.build.BuildActivity; import com.stardust.scriptdroid.ui.build.BuildActivity_; +import com.stardust.scriptdroid.ui.log.LogActivity_; import com.stardust.theme.dialog.ThemeColorMaterialDialogBuilder; import com.stardust.util.ClipboardUtil; @@ -258,7 +259,7 @@ public class EditorMenu { private void showLog() { - AutoJs.getInstance().getScriptEngineService().getGlobalConsole().show(); + LogActivity_.intent(mContext).start(); } private void showConsole() { diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java b/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java new file mode 100644 index 00000000..105f9773 --- /dev/null +++ b/app/src/main/java/com/stardust/scriptdroid/ui/log/LogActivity.java @@ -0,0 +1,40 @@ +package com.stardust.scriptdroid.ui.log; + +import android.os.Bundle; +import android.support.design.widget.FloatingActionButton; +import android.support.design.widget.Snackbar; +import android.support.v7.app.AppCompatActivity; +import android.support.v7.widget.Toolbar; +import android.view.View; + +import com.stardust.autojs.core.console.ConsoleView; +import com.stardust.autojs.core.console.StardustConsole; +import com.stardust.scriptdroid.R; +import com.stardust.scriptdroid.autojs.AutoJs; +import com.stardust.scriptdroid.ui.BaseActivity; + +import org.androidannotations.annotations.AfterViews; +import org.androidannotations.annotations.Click; +import org.androidannotations.annotations.EActivity; +import org.androidannotations.annotations.ViewById; + +@EActivity(R.layout.activity_log) +public class LogActivity extends BaseActivity { + + @ViewById(R.id.console) + ConsoleView mConsoleView; + + private StardustConsole mStardustConsole; + + @AfterViews + void setupViews() { + setToolbarAsBack(getString(R.string.text_log)); + mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole(); + mConsoleView.setConsole(mStardustConsole); + } + + @Click(R.id.fab) + void clearConsole() { + mStardustConsole.clear(); + } +} 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 cece68e0..bc46a5d7 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 @@ -32,6 +32,7 @@ import com.stardust.scriptdroid.ui.floating.FloatyWindowManger; import com.stardust.scriptdroid.io.StorageFileProvider; import com.stardust.scriptdroid.ui.main.community.CommunityFragment_; import com.stardust.scriptdroid.ui.main.sample.SampleListFragment; +import com.stardust.scriptdroid.ui.log.LogActivity_; import com.stardust.scriptdroid.ui.main.sample.SampleListFragment_; import com.stardust.scriptdroid.ui.main.scripts.MyScriptListFragment_; import com.stardust.scriptdroid.ui.main.task.TaskManagerFragment_; @@ -259,6 +260,15 @@ public class MainActivity extends BaseActivity implements OnActivityResultDelega return true; } + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if(item.getItemId() == R.id.action_log){ + LogActivity_.intent(this).start(); + return true; + } + return super.onOptionsItemSelected(item); + } + private void setUpSearchMenuItem(MenuItem searchMenuItem) { mSearchViewItem = new SearchViewItem(this, searchMenuItem); mSearchViewItem.setQueryCallback(this::submitQuery); diff --git a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java index 45b9396e..fc403661 100644 --- a/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java +++ b/app/src/main/java/com/stardust/scriptdroid/ui/main/task/TaskManagerFragment.java @@ -24,7 +24,7 @@ import org.androidannotations.annotations.ViewById; * Created by Stardust on 2017/3/24. */ @EFragment(R.layout.fragment_task_manager) -public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu.OnMenuItemClickListener { +public class TaskManagerFragment extends ViewPagerFragment { @ViewById(R.id.task_list) TaskListRecyclerView mTaskListRecyclerView; @@ -35,36 +35,17 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu. @ViewById(R.id.swipe_refresh_layout) SwipeRefreshLayout mSwipeRefreshLayout; - @ViewById(R.id.task_manager_view) - View mTaskManagerView; - - @ViewById(R.id.spinner) - View mSpinner; - - @ViewById(R.id.spinner_current_item) - TextView mSpinnerCurrentItem; - - @ViewById(R.id.console) - ConsoleView mConsoleView; - - private StardustConsole mStardustConsole; public TaskManagerFragment() { super(45); setArguments(new Bundle()); } - @AfterViews void setUpViews() { init(); final boolean noRunningScript = mTaskListRecyclerView.getAdapter().getItemCount() == 0; mNoRunningScriptNotice.setVisibility(noRunningScript ? View.VISIBLE : View.GONE); - mStardustConsole = (StardustConsole) AutoJs.getInstance().getGlobalConsole(); - mConsoleView.setConsole(mStardustConsole); - if (getArguments().getBoolean("console_shown", false)) { - showLog(); - } } private void init() { @@ -90,51 +71,9 @@ public class TaskManagerFragment extends ViewPagerFragment implements PopupMenu. }); } - @Click(R.id.spinner) - void showPopupMenu() { - PopupMenu popupMenu = new PopupMenu(getContext(), mSpinner); - popupMenu.inflate(R.menu.menu_manager); - popupMenu.show(); - popupMenu.setOnMenuItemClickListener(this); - } - - @Override - public boolean onMenuItemClick(MenuItem item) { - int id = item.getItemId(); - if (id == R.id.task_manage) { - showTaskManager(); - } else { - showLog(); - } - return true; - } - - - private void showLog() { - mTaskManagerView.setVisibility(View.GONE); - mConsoleView.setVisibility(View.VISIBLE); - mSpinnerCurrentItem.setText(R.string.text_log); - } - - private void showTaskManager() { - mConsoleView.setVisibility(View.GONE); - mTaskManagerView.setVisibility(View.VISIBLE); - mSpinnerCurrentItem.setText(R.string.text_task_manage); - } - - @Override protected void onFabClick(FloatingActionButton fab) { - if (mConsoleView.getVisibility() == View.VISIBLE) { - mStardustConsole.clear(); - } else { - AutoJs.getInstance().getScriptEngineService().stopAll(); - } + AutoJs.getInstance().getScriptEngineService().stopAll(); } - @Override - public void onPause() { - super.onPause(); - getArguments().putBoolean("console_shown", mConsoleView.getVisibility() == View.VISIBLE); - } } diff --git a/app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-hdpi/ic_clear_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..6b717e0dda8649aa3b5f1d6851ba0dd20cc4ea66 GIT binary patch literal 347 zcmV-h0i^zkP)vMkH8EXyh{JTRaptiwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVq zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_ali_log.png b/app/src/main/res/drawable-xhdpi/ic_ali_log.png new file mode 100644 index 0000000000000000000000000000000000000000..a878c76aa97307366db51974fc75b9458d0e1092 GIT binary patch literal 1135 zcmeAS@N?(olHy`uVBq!ia0vp^D?ylp4M+xDmDLAQoCO|{#S9F5M?jcysy3fA0|Seq zr;B4q#hkZy-{;;A6KVTc++Ejiw!*x_jKh2bknAw`Fml|}xZ80OXO3?`Y11j;h?x)G zvIn(#-4NpJw$eZOoSlV{$z0#xpdG*KDl*(-Fm#sej?ECzsQ_ecfPu>@DfB7E&h`YOPctq_p`kwo(VEqsG zOUu3MW!1ec+wZL_o3zgF%zLR-A@}2|Kgvs3O?v-o=l7+LKi^2>uR5~1$9e0%UDLO8 z{n~Tx=KS=!m^N1zn-@m}6}xknoaIj2pBmwHv#jPtfVlJXO&pi6-!{9{@ne#$gZQhu z(-}P5r)hbHeiO)@Hqk8pNB_;@l91AxId3iFyYIF&r7jUPTvq$${BpSqYy7Ss?k^IP z-^89#-1|kVx*XG1@K=RWs2jC;Fw?RAf}aZC8ZR=qc`yEA|Bs(Up*WCZyQ z`#xWE4*UFXp6vncHE~P&rd_;~Hff6W$s;?~Ejdu%A@U6?iYcGd_CfoVe9>&F-T54r z+bvypX)X=9={#q4+6MO159P4y0vh#f%i}L`mz=)|yvX;PsJH0%?%o3&?bSDwgRrC7 zm-{Zyl0PD?9)?2!P$Niu}$=w_|8kS|EBYnvk%&B@An+GeIuxe9i7cQ{_?QQz0<{A5uSP zE?d95dWru{=QC%*w>#ImxSW)GAmRD@zu}YEPa4G=^g!Xe=SZb$Z_p_((hjQ-gBye@Du{yRCB9<%pKjy2&io3NIIzF2tS3R=R?ZN_^>p=fS?83{1ORh!1$Y1e literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-xhdpi/ic_clear_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..39641921925f090e33df2767a4ee5e6d5911194f GIT binary patch literal 436 zcmV;l0ZaagP)32ETvhYyB39D^lU%DgQgv&#U%8l^-CA%qY@2qA=!B5=cm zUgehujQG*l{{`@rPr!f|fEk^>KI9WteE@ilV6HEl&_rJ@p_zU*;T}RirIc{5NocNLm*7JGdV(AM zYYDFOvk5~8{Z*t_>U=!XvoehUSEh=adIga45oe)B9kGgT}7UT3Cirmr(oHPv^YQ1-p=Hlh5u;xggf zX{&yw+El-OrrKQJRl@b7x{HLmNkj95`a#LLnW{Veb2C+!`ppt#r)=g4@?c8RY{yJj~W@W|h^mU4q`i)2y~Rw@J`jIh$1%|In!~{Tb{nMqaxlgb+dq eA%qY@zJ@mriVM?qfwL0;0000u<8%L#D-{7p<|%4@n9yOn_`BhIN5Se>F5&yX=g3#NJr`MF8+b%+$B8BmnCIPndHJicwnxNiHsOkk&+*iSjJjmJe1$X)E`JjJT7)$8wm+rVMFtHWj=GUBk= z=ke_WBcq(Ni(Gt*T>KFvWMaekQTMd-+4Z${JvAkNz8{`iZ@=$N<$){y-?y+S-FBWF zc%ND6E)u%gY+Qf)aIpRD!%Emtu>HZuoi`qLflzYyjmJ==_n}6?N_~C6*PuJQ&feR6 zYOCY7g5y!UB2LPQOzopr0M`r!;Q#;t literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_clear_white_48dp.png new file mode 100644 index 0000000000000000000000000000000000000000..bb21ce03a954236e431072961e57a9af317a68ee GIT binary patch literal 702 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1#sNMdu0Z-fiD3KGM@>L&0wqCy z!3?}ShmRdO`suT!jkVQ|?c1(&>uh9TVAAq*aSW-5dwa(*PbyG=?IF*RV-kihZ5`K%4WRLhrBZ|F1`7uibhLg{ZBIk7Kr&_g(j2|L0$mnjU|z+@1e% z{_2El_4Br`m;D!N@TR><^S_qFH|K*>>P3Bi{};6}`w@O{jy%`0KLG|0+M76ml3&-? zf<;^8xsLr^op5ab;s?KN7A73n|1I6-!KZJ@2XChy;+OYxY&^ivnr1J4<8MsD_u|I8 z=UL0(oIB@P+mD>LUf}ThIn(a>+;8giHvHas;2j#Ldp`HQdX>HMKz%R%#ykKTa{oN* zn{x3D_hS##RWkni%KGHH_=NlM40ZL5ch1LueXv~&ELG0<`z~BvHRI2}Fm?Z!esN5c z=lUh}w!P<1%!R`-{g>Z7Z~7PXZTY;v*R@4%{1vaTc7MP8d-tC@jSIgQI=pXZ+AELh zx+isd7H{h6tdFBR7R?*?a|M6wg*yVpML^D9);Hh9Z4TPUe30S)u`Accm+AO6Hmvuct~^wI jTJ;u6{1-oD!M + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_task_manager.xml b/app/src/main/res/layout/fragment_task_manager.xml index 888ec85a..2cd05ca2 100644 --- a/app/src/main/res/layout/fragment_task_manager.xml +++ b/app/src/main/res/layout/fragment_task_manager.xml @@ -1,80 +1,30 @@ - + - + + + + + + + android:layout_gravity="center" + android:gravity="center" + android:text="@string/notice_no_running_script" + android:textColor="#adadad" + android:textSize="16sp"/> - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index bdf33d43..9a394757 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -2,6 +2,12 @@ + + -4dp 0dp 0dp + 16dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9002e3d3..dac67209 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -308,4 +308,5 @@ js binary + LogActivity