From 67f995915bed27ce3ce5404c627a7c09cc5eaae6 Mon Sep 17 00:00:00 2001 From: hyb1996 <946994919@qq.com> Date: Tue, 27 Nov 2018 12:28:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=9C=A8=E9=AD=85?= =?UTF-8?q?=E6=97=8F=E8=AE=BE=E5=A4=87=E4=B8=8A=E6=96=B0=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E3=80=81=E9=97=AE=E9=A2=98=E5=8F=8D=E9=A6=88=E3=80=81?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=BA=94=E7=94=A8=E7=AD=89=E5=B4=A9=E6=BA=83?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../autojs/ui/common/ScriptLoopDialog.java | 17 +- .../error/AbstractIssueReporterActivity.java | 148 ++++++----------- .../autojs/ui/project/BuildActivity.java | 18 +- .../ui/project/ProjectConfigActivity.java | 13 +- app/src/main/res/layout/activity_build.xml | 12 +- app/src/main/res/layout/activity_login.xml | 4 +- .../res/layout/activity_project_config.xml | 13 +- app/src/main/res/layout/activity_register.xml | 6 +- .../layout/activity_timed_task_setting.xml | 2 +- .../layout/air_activity_issue_reporter.xml | 2 +- .../main/res/layout/air_card_login_compat.xml | 156 ++++++++++++++++++ .../res/layout/air_card_report_compat.xml | 4 +- .../main/res/layout/dialog_class_search.xml | 2 +- .../main/res/layout/dialog_script_loop.xml | 6 +- .../res/layout/shortcut_create_dialog.xml | 2 +- 15 files changed, 255 insertions(+), 150 deletions(-) create mode 100644 app/src/main/res/layout/air_card_login_compat.xml diff --git a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java index 81f02d34..647532d5 100644 --- a/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java +++ b/app/src/main/java/org/autojs/autojs/ui/common/ScriptLoopDialog.java @@ -2,15 +2,15 @@ package org.autojs.autojs.ui.common; import android.content.Context; import android.support.annotation.NonNull; -import android.support.design.widget.TextInputEditText; import android.view.View; import android.view.Window; +import android.widget.EditText; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.stardust.app.DialogUtils; import com.stardust.app.GlobalAppContext; -import org.autojs.autojs.App; + import org.autojs.autojs.R; import org.autojs.autojs.model.script.ScriptFile; import org.autojs.autojs.model.script.Scripts; @@ -28,13 +28,13 @@ public class ScriptLoopDialog { private MaterialDialog mDialog; @BindView(R.id.loop_times) - TextInputEditText mLoopTimes; + EditText mLoopTimes; @BindView(R.id.loop_interval) - TextInputEditText mLoopInterval; + EditText mLoopInterval; @BindView(R.id.loop_delay) - TextInputEditText mLoopDelay; + EditText mLoopDelay; public ScriptLoopDialog(Context context, ScriptFile file) { @@ -44,12 +44,7 @@ public class ScriptLoopDialog { .title(R.string.text_run_repeatedly) .customView(view, true) .positiveText(R.string.ok) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) { - startScriptRunningLoop(); - } - }) + .onPositive((dialog, which) -> startScriptRunningLoop()) .build(); ButterKnife.bind(this, view); } diff --git a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java index dc420b82..355cabd0 100644 --- a/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/error/AbstractIssueReporterActivity.java @@ -4,8 +4,6 @@ import android.app.Activity; import android.app.Dialog; import android.content.Context; import android.content.DialogInterface; -import android.graphics.Color; -import android.graphics.PorterDuff; import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.os.Build; @@ -15,11 +13,8 @@ import android.support.annotation.Nullable; import android.support.annotation.StringDef; import android.support.annotation.StringRes; import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.TextInputEditText; import android.support.design.widget.TextInputLayout; -import android.support.v4.app.NavUtils; import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.util.Log; @@ -36,6 +31,7 @@ import android.widget.Toast; import com.afollestad.materialdialogs.DialogAction; import com.afollestad.materialdialogs.MaterialDialog; import com.github.aakira.expandablelayout.ExpandableRelativeLayout; +import com.heinrichreimersoftware.androidissuereporter.R; import com.heinrichreimersoftware.androidissuereporter.model.DeviceInfo; import com.heinrichreimersoftware.androidissuereporter.model.Report; import com.heinrichreimersoftware.androidissuereporter.model.github.ExtraInfo; @@ -43,7 +39,9 @@ import com.heinrichreimersoftware.androidissuereporter.model.github.GithubLogin; import com.heinrichreimersoftware.androidissuereporter.model.github.GithubTarget; import com.heinrichreimersoftware.androidissuereporter.util.ColorUtils; import com.heinrichreimersoftware.androidissuereporter.util.ThemeUtils; +import com.stardust.theme.ThemeColorManager; +import org.autojs.autojs.BuildConfig; import org.autojs.autojs.ui.BaseActivity; import org.eclipse.egit.github.core.Issue; import org.eclipse.egit.github.core.client.GitHubClient; @@ -57,10 +55,6 @@ import java.lang.ref.WeakReference; import static android.util.Patterns.EMAIL_ADDRESS; -import com.heinrichreimersoftware.androidissuereporter.R; -import org.autojs.autojs.BuildConfig; -import com.stardust.theme.ThemeColorManager; - /** * Created by Stardust on 2017/4/3. */ @@ -88,15 +82,15 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { private boolean emailRequired = false; private int bodyMinChar = 0; private Toolbar toolbar; - private TextInputEditText inputTitle; - private TextInputEditText inputDescription; + private EditText inputTitle; + private EditText inputDescription; private TextView textDeviceInfo; private ImageButton buttonDeviceInfo; private ExpandableRelativeLayout layoutDeviceInfo; private ExpandableRelativeLayout layoutAnonymous; - private TextInputEditText inputUsername; - private TextInputEditText inputPassword; - private TextInputEditText inputEmail; + private EditText inputUsername; + private EditText inputPassword; + private EditText inputEmail; private RadioButton optionUseAccount; private RadioButton optionAnonymous; private ExpandableRelativeLayout layoutLogin; @@ -127,12 +121,7 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { handleIntent(); - optionAnonymous.post(new Runnable() { - @Override - public void run() { - optionAnonymous.performClick(); - } - }); + optionAnonymous.post(() -> optionAnonymous.performClick()); } private void handleIntent() { @@ -153,23 +142,23 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { } private void findViews() { - toolbar = (Toolbar) findViewById(R.id.air_toolbar); + toolbar = findViewById(R.id.air_toolbar); - inputTitle = (TextInputEditText) findViewById(R.id.air_inputTitle); - inputDescription = (TextInputEditText) findViewById(R.id.air_inputDescription); - textDeviceInfo = (TextView) findViewById(R.id.air_textDeviceInfo); - buttonDeviceInfo = (ImageButton) findViewById(R.id.air_buttonDeviceInfo); - layoutDeviceInfo = (ExpandableRelativeLayout) findViewById(R.id.air_layoutDeviceInfo); + inputTitle = findViewById(R.id.air_inputTitle); + inputDescription = findViewById(R.id.air_inputDescription); + textDeviceInfo = findViewById(R.id.air_textDeviceInfo); + buttonDeviceInfo = findViewById(R.id.air_buttonDeviceInfo); + layoutDeviceInfo = findViewById(R.id.air_layoutDeviceInfo); - inputUsername = (TextInputEditText) findViewById(R.id.air_inputUsername); - inputPassword = (TextInputEditText) findViewById(R.id.air_inputPassword); - inputEmail = (TextInputEditText) findViewById(R.id.air_inputEmail); - optionUseAccount = (RadioButton) findViewById(R.id.air_optionUseAccount); - optionAnonymous = (RadioButton) findViewById(R.id.air_optionAnonymous); - layoutLogin = (ExpandableRelativeLayout) findViewById(R.id.air_layoutLogin); - layoutAnonymous = (ExpandableRelativeLayout) findViewById(R.id.air_layoutGuest); + inputUsername = findViewById(R.id.air_inputUsername); + inputPassword = findViewById(R.id.air_inputPassword); + inputEmail = findViewById(R.id.air_inputEmail); + optionUseAccount = findViewById(R.id.air_optionUseAccount); + optionAnonymous = findViewById(R.id.air_optionAnonymous); + layoutLogin = findViewById(R.id.air_layoutLogin); + layoutAnonymous = findViewById(R.id.air_layoutGuest); - buttonSend = (FloatingActionButton) findViewById(R.id.air_buttonSend); + buttonSend = findViewById(R.id.air_buttonSend); } private void initViews() { @@ -186,46 +175,30 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { toolbar.setBackgroundColor(ThemeColorManager.getColorPrimary()); - toolbar.setNavigationOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + toolbar.setNavigationOnClickListener(v -> finish()); - buttonDeviceInfo.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - layoutDeviceInfo.toggle(); - } - }); + buttonDeviceInfo.setOnClickListener(v -> layoutDeviceInfo.toggle()); - inputPassword.setOnEditorActionListener(new TextView.OnEditorActionListener() { - @Override - public boolean onEditorAction(TextView textView, int actionId, KeyEvent event) { - if (actionId == EditorInfo.IME_ACTION_SEND) { - reportIssue(); - return true; - } - return false; + inputPassword.setOnEditorActionListener((textView, actionId, event) -> { + if (actionId == EditorInfo.IME_ACTION_SEND) { + reportIssue(); + return true; } + return false; }); updateGuestTokenViews(); buttonSend.setImageResource(ColorUtils.isDark(ThemeUtils.getColorAccent(this)) ? R.drawable.air_ic_send_dark : R.drawable.air_ic_send_light); - buttonSend.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - reportIssue(); - } catch (Exception e) { - e.printStackTrace(); - mReportFailed = true; - finish(); - } + buttonSend.setOnClickListener(v -> { + try { + reportIssue(); + } catch (Exception e) { + e.printStackTrace(); + mReportFailed = true; + finish(); } }); @@ -251,24 +224,18 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { } else { setOptionUseAccountMarginStart(0); optionUseAccount.setEnabled(true); - optionUseAccount.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - layoutLogin.expand(); - layoutAnonymous.collapse(); - inputUsername.setEnabled(true); - inputPassword.setEnabled(true); - } + optionUseAccount.setOnClickListener(v -> { + layoutLogin.expand(); + layoutAnonymous.collapse(); + inputUsername.setEnabled(true); + inputPassword.setEnabled(true); }); optionAnonymous.setVisibility(View.VISIBLE); - optionAnonymous.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - layoutLogin.collapse(); - layoutAnonymous.expand(); - inputUsername.setEnabled(false); - inputPassword.setEnabled(false); - } + optionAnonymous.setOnClickListener(v -> { + layoutLogin.collapse(); + layoutAnonymous.expand(); + inputUsername.setEnabled(false); + inputPassword.setEnabled(false); }); } } @@ -348,7 +315,7 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { return !hasErrors; } - private void setError(TextInputEditText editText, @StringRes int errorRes) { + private void setError(EditText editText, @StringRes int errorRes) { try { View layout = (View) editText.getParent(); while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName())) @@ -360,7 +327,7 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { } } - private void setError(TextInputEditText editText, String error) { + private void setError(EditText editText, String error) { try { View layout = (View) editText.getParent(); while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName())) @@ -372,7 +339,7 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { } } - private void removeError(TextInputEditText editText) { + private void removeError(EditText editText) { try { View layout = (View) editText.getParent(); while (!layout.getClass().getSimpleName().equals(TextInputLayout.class.getSimpleName())) @@ -544,19 +511,8 @@ public abstract class AbstractIssueReporterActivity extends BaseActivity { .title(R.string.air_dialog_title_failed) .content(R.string.air_dialog_description_failed_unknown) .positiveText(R.string.air_dialog_action_failed) - .onPositive(new MaterialDialog.SingleButtonCallback() { - @Override - public void onClick(@NonNull MaterialDialog dialog, - @NonNull DialogAction which) { - tryToFinishActivity(); - } - }) - .cancelListener(new DialogInterface.OnCancelListener() { - @Override - public void onCancel(DialogInterface dialog) { - tryToFinishActivity(); - } - }) + .onPositive((dialog, which) -> tryToFinishActivity()) + .cancelListener(dialog -> tryToFinishActivity()) .show(); break; } diff --git a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java index c84414ca..46dabb53 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/BuildActivity.java @@ -6,13 +6,13 @@ import android.graphics.Bitmap; import android.os.Bundle; import android.os.Environment; import android.support.annotation.Nullable; -import android.support.design.widget.TextInputEditText; import android.support.design.widget.TextInputLayout; import android.support.v7.widget.CardView; import android.text.Editable; import android.text.TextUtils; import android.util.Log; import android.view.View; +import android.widget.EditText; import android.widget.ImageView; import android.widget.Toast; @@ -61,25 +61,25 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa private static final Pattern REGEX_PACKAGE_NAME = Pattern.compile("^([A-Za-z][A-Za-z\\d_]*\\.)+([A-Za-z][A-Za-z\\d_]*)$"); @ViewById(R.id.source_path) - TextInputEditText mSourcePath; + EditText mSourcePath; @ViewById(R.id.source_path_container) View mSourcePathContainer; @ViewById(R.id.output_path) - TextInputEditText mOutputPath; + EditText mOutputPath; @ViewById(R.id.app_name) - TextInputEditText mAppName; + EditText mAppName; @ViewById(R.id.package_name) - TextInputEditText mPackageName; + EditText mPackageName; @ViewById(R.id.version_name) - TextInputEditText mVersionName; + EditText mVersionName; @ViewById(R.id.version_code) - TextInputEditText mVersionCode; + EditText mVersionCode; @ViewById(R.id.icon) ImageView mIcon; @@ -224,7 +224,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa return inputValid; } - private boolean checkPackageNameValid(TextInputEditText editText) { + private boolean checkPackageNameValid(EditText editText) { Editable text = editText.getText(); String hint = ((TextInputLayout) editText.getParent().getParent()).getHint().toString(); if (TextUtils.isEmpty(text)) { @@ -239,7 +239,7 @@ public class BuildActivity extends BaseActivity implements ApkBuilder.ProgressCa } - private boolean checkNotEmpty(TextInputEditText editText) { + private boolean checkNotEmpty(EditText editText) { if (!TextUtils.isEmpty(editText.getText()) || !editText.isShown()) return true; // TODO: 2017/12/8 more beautiful ways? diff --git a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java index 1bd9c585..60b7ddf1 100644 --- a/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java +++ b/app/src/main/java/org/autojs/autojs/ui/project/ProjectConfigActivity.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.graphics.Bitmap; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.design.widget.TextInputEditText; import android.support.design.widget.TextInputLayout; import android.text.Editable; import android.text.TextUtils; @@ -58,16 +57,16 @@ public class ProjectConfigActivity extends BaseActivity { EditText mProjectLocation; @ViewById(R.id.app_name) - TextInputEditText mAppName; + EditText mAppName; @ViewById(R.id.package_name) - TextInputEditText mPackageName; + EditText mPackageName; @ViewById(R.id.version_name) - TextInputEditText mVersionName; + EditText mVersionName; @ViewById(R.id.version_code) - TextInputEditText mVersionCode; + EditText mVersionCode; @ViewById(R.id.main_file_name) EditText mMainFileName; @@ -215,7 +214,7 @@ public class ProjectConfigActivity extends BaseActivity { return inputValid; } - private boolean checkPackageNameValid(TextInputEditText editText) { + private boolean checkPackageNameValid(EditText editText) { Editable text = editText.getText(); String hint = ((TextInputLayout) editText.getParent().getParent()).getHint().toString(); if(TextUtils.isEmpty(text)){ @@ -230,7 +229,7 @@ public class ProjectConfigActivity extends BaseActivity { } - private boolean checkNotEmpty(TextInputEditText editText) { + private boolean checkNotEmpty(EditText editText) { if (!TextUtils.isEmpty(editText.getText())) return true; // TODO: 2017/12/8 more beautiful ways? diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml index dad46b97..7af0c83a 100644 --- a/app/src/main/res/layout/activity_build.xml +++ b/app/src/main/res/layout/activity_build.xml @@ -68,7 +68,7 @@ android:layout_weight="1" android:hint="@string/text_source_file_path"> - - - @@ -159,7 +159,7 @@ android:layout_marginTop="12dp" android:hint="@string/text_package_name"> - - - - - - @@ -73,7 +73,7 @@ android:layout_marginTop="12dp" android:hint="@string/text_package_name"> - - - @@ -154,7 +153,7 @@ android:layout_height="wrap_content" android:hint="@string/text_project_location"> - - - - - - diff --git a/app/src/main/res/layout/air_card_login_compat.xml b/app/src/main/res/layout/air_card_login_compat.xml new file mode 100644 index 00000000..27575259 --- /dev/null +++ b/app/src/main/res/layout/air_card_login_compat.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/air_card_report_compat.xml b/app/src/main/res/layout/air_card_report_compat.xml index 80c1d565..af08b9a0 100644 --- a/app/src/main/res/layout/air_card_report_compat.xml +++ b/app/src/main/res/layout/air_card_report_compat.xml @@ -47,7 +47,7 @@ android:layout_marginTop="@dimen/air_baseline" android:hint="@string/air_label_issue_title"> - - - diff --git a/app/src/main/res/layout/dialog_script_loop.xml b/app/src/main/res/layout/dialog_script_loop.xml index 24738fa2..e94b1b97 100644 --- a/app/src/main/res/layout/dialog_script_loop.xml +++ b/app/src/main/res/layout/dialog_script_loop.xml @@ -13,7 +13,7 @@ android:layout_height="wrap_content" android:hint="@string/text_loop_times"> - - - -