erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-18 05:37:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #7832 from keymanapp/fix/android/tablet-keyboard-update

Browse source 
fix(android/app): Toggle keyboard update notifications for landscape and tablets
This commit is contained in:
Darcy Wong 2022-11-30 08:33:42 +07:00 • committed by GitHub
commit e78f5fd6e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -353,6 +353,7 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
@SuppressLint("RestrictedApi")
@Override
public boolean onPrepareOptionsMenu(final Menu menu) {
this.menu = menu;
final MenuItem _overflowMenuItem = menu.findItem(R.id.action_overflow);
if (_overflowMenuItem != null) {
MenuItem updateKeyboards = this.menu.findItem(R.id.action_update_keyboards);
@ -372,8 +373,8 @@ public class MainActivity extends BaseActivity implements OnKeyboardEventListene
}
final MenuItem _keyboardupdate = menu.findItem(R.id.action_update_keyboards);
if (_keyboardupdate != null) {
updateUpdateCountIndicator(_keyboardupdate, anUpdateCount, true);
if (_keyboardupdate != null && anUpdateCount > 0) {
_keyboardupdate.setVisible(true);
}
}
@ -452,6 +453,11 @@ 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;
default:
return super.onOptionsItemSelected(item);

8
android/KMAPro/kMAPro/src/main/res/menu-land/main.xml
View file

@ -45,10 +45,12 @@
android:title="@string/action_settings"
android:icon="@drawable/ic_settings" />
<item
<!-- hidden until updates available -->
<item
android:id="@+id/action_update_keyboards"
android:title="@string/action_install_updates"
app:showAsAction="always"
app:actionLayout="@layout/update_count_view"/>
android:title="@string/action_install_updates"
android:visible="false"
android:icon="@drawable/ic_cloud_download" />
</menu>

10
android/KMAPro/kMAPro/src/main/res/menu-sw600dp/main.xml
View file

@ -45,10 +45,12 @@
android:title="@string/action_settings"
android:icon="@drawable/ic_settings" />
<!-- hidden until updates available -->
<item
android:id="@+id/action_update_keyboards"
android:title="@string/action_install_updates"
app:showAsAction="always"
app:actionLayout="@layout/update_count_view"/>
android:id="@+id/action_update_keyboards"
app:showAsAction="always"
android:title="@string/action_install_updates"
android:visible="false"
android:icon="@drawable/ic_cloud_download" />
</menu>