erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-18 11:57:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

resolve the update option from always appearing

Browse source
This commit is contained in:
Mengchou97 2026-07-08 13:24:07 +07:00
parent 8e55aec87b
commit 812fca0d9e
1 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/MainActivity.java
View file

@ -565,9 +565,20 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
if (menu == null) {
return;
}
final MenuItem _keyboardupdate = menu.findItem(R.id.action_update_keyboards);
if (_keyboardupdate != null && anUpdateCount > 0) {
_keyboardupdate.setVisible(true);
// 1. Update the Top Action Bar Menu
if (menu != null) {
final MenuItem toolbarUpdate = menu.findItem(R.id.action_update_keyboards);
if (toolbarUpdate != null) {
toolbarUpdate.setVisible(anUpdateCount > 0);
}
}
// 2. Update the Drawer/Sidebar Navigation Menu
if (navigationView != null) {
final MenuItem drawerUpdate = navigationView.getMenu().findItem(R.id.action_update_keyboards);
if (drawerUpdate != null) {
drawerUpdate.setVisible(anUpdateCount > 0);
}
}
}
@ -609,8 +620,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
public void propertyChange(PropertyChangeEvent evt) {
if(!evt.getPropertyName().equals("updateCount"))
return;
updateUpdateCountIndicator(
evt.getNewValue()==null?0:(Integer) evt.getNewValue());
int count = KMManager.getUpdateTool().getOpenUpdateCount();
updateUpdateCountIndicator(count);
}
}
);
@ -647,11 +658,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
KMManager.getUpdateTool().executeOpenUpdates();
// Dismiss icon
updateUpdateCountIndicator(0);
final MenuItem _keyboardupdate = menu.findItem(R.id.action_update_keyboards);
if (_keyboardupdate != null && _keyboardupdate.isVisible()) {
_keyboardupdate.setVisible(false);
}
return true;
} else if (item.getItemId() == R.id.action_sidebar) {
if (drawerLayout.isDrawerOpen(GravityCompat.END)) {
@ -1316,10 +1322,6 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
} else if (id == R.id.action_update_keyboards) {
KMManager.getUpdateTool().executeOpenUpdates();
updateUpdateCountIndicator(0);
final MenuItem keyboardUpdate = navigationView.getMenu().findItem(R.id.action_update_keyboards);
if (keyboardUpdate != null && keyboardUpdate.isVisible()) {
keyboardUpdate.setVisible(false);
}
} else if (id == R.id.action_settings) {
showSettings();
} else if (id == R.id.nav_installed_languages) {
@ -1340,8 +1342,9 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
startActivity(new Intent(context, InfoActivity.class));
} else if (id == R.id.nav_palette) {
openThemeDialog();
} else if (id == R.id.nav_about_current_keyboard) {
showCurrentKeyboardSettings();
}
return true;
}