daily: ui adjustment

This commit is contained in:
hyb1996
2018-01-25 17:10:41 +08:00
parent b860c9ee5b
commit 7908190ab6
4 changed files with 6 additions and 4 deletions

View File

@@ -59,14 +59,16 @@ public class FloatyWindowManger {
return sCircularMenu != null && sCircularMenu.get() != null;
}
public static void showCircularMenu() {
public static boolean showCircularMenu() {
if (!SettingsCompat.canDrawOverlays(App.getApp())) {
Toast.makeText(App.getApp(), R.string.text_no_floating_window_permission, Toast.LENGTH_SHORT).show();
manageDrawOverlays(App.getApp());
return false;
} else {
App.getApp().startService(new Intent(App.getApp(), FloatyService.class));
CircularMenu menu = new CircularMenu(App.getApp());
sCircularMenu = new WeakReference<>(menu);
return true;
}
}

View File

@@ -203,7 +203,7 @@ public class DrawerFragment extends android.support.v4.app.Fragment {
Pref.setFloatingMenuShown(checked);
}
if (checked && !isFloatingWindowShowing) {
FloatyWindowManger.showCircularMenu();
setChecked(mFloatingWindowItem, FloatyWindowManger.showCircularMenu());
enableAccessibilityServiceByRootIfNeeded();
} else if (!checked && isFloatingWindowShowing) {
FloatyWindowManger.hideCircularMenu();

View File

@@ -77,10 +77,10 @@ public class DrawerMenuItemViewHolder extends BindableViewHolder<DrawerMenuItem>
} else {
mSwitchCompat.setPrefKey(itemView.getResources().getString(prefKey));
}
mSwitchCompat.setOnCheckedChangeListener((buttonView, isChecked) -> mDrawerMenuItem.setChecked(isChecked));
}
private void onClick() {
mDrawerMenuItem.setChecked(mSwitchCompat.isChecked());
if (mAntiShake && (System.currentTimeMillis() - mLastClickMillis < CLICK_TIMEOUT)) {
Toast.makeText(itemView.getContext(), R.string.text_click_too_frequently, Toast.LENGTH_SHORT).show();
mSwitchCompat.setChecked(!mSwitchCompat.isChecked(), false);