Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Add counter to "Installed" tab. Closes #497



See merge request !176
This commit is contained in:
Ruben Roy 2015-12-02 00:30:23 +00:00
commit 676d173cc9
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
F-Droid/res/values/strings.xml
View File

@ -81,6 +81,8 @@
<string name="tab_available_apps">Available</string>
<string name="tab_installed_apps">Installed</string>
<string name="tab_updates">Updates</string>
<string name="tab_installed_apps_i18n">Installed (%d)</string>
<string name="tab_updates_i18n">Updates (%d)</string>
<string name="one_update_available">1 update is available.</string>
<string name="many_updates_available">%d updates are available.</string>
<string name="fdroid_updates_available">F-Droid Updates Available</string>
@ -375,4 +377,5 @@
<string name="theme_light">Light</string>
<string name="theme_dark">Dark</string>
<string name="theme_night">Night</string>
<string name="installed_title">Installed</string>
</resources>

1
F-Droid/src/org/fdroid/fdroid/FDroid.java
View File

@ -355,6 +355,7 @@ public class FDroid extends ActionBarActivity {
private void refreshUpdateTabLabel() {
getTabManager().refreshTabLabel(TabManager.INDEX_CAN_UPDATE);
getTabManager().refreshTabLabel(TabManager.INDEX_INSTALLED);
}
public void removeNotification(int id) {

11
F-Droid/src/org/fdroid/fdroid/views/AppListFragmentPagerAdapter.java
View File

@ -24,11 +24,14 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
this.parent = parent;
}
private String getInstalledTabTitle() {
int installedCount = AppProvider.Helper.count(parent, AppProvider.getInstalledUri());
return parent.getString(R.string.tab_installed_apps_i18n, installedCount);
}
private String getUpdateTabTitle() {
int updateCount = AppProvider.Helper.count(parent, AppProvider.getCanUpdateUri());
// TODO: Make RTL friendly, probably by having a different string for both tab_updates_none and tab_updates
return parent.getString(R.string.tab_updates) + " (" + updateCount + ")";
return parent.getString(R.string.tab_updates_i18n, updateCount);
}
@Override
@ -54,7 +57,7 @@ public class AppListFragmentPagerAdapter extends FragmentPagerAdapter {
case TabManager.INDEX_AVAILABLE:
return parent.getString(R.string.tab_available_apps);
case TabManager.INDEX_INSTALLED:
return parent.getString(R.string.tab_installed_apps);
return getInstalledTabTitle();
case TabManager.INDEX_CAN_UPDATE:
return getUpdateTabTitle();
default:

2
F-Droid/src/org/fdroid/fdroid/views/fragments/CanUpdateAppsFragment.java
View File

@ -20,7 +20,7 @@ public class CanUpdateAppsFragment extends AppListFragment {
@Override
protected String getFromTitle() {
return getString(R.string.tab_updates);
return getString(R.string.updates);
}
@Override

2
F-Droid/src/org/fdroid/fdroid/views/fragments/InstalledAppsFragment.java
View File

@ -20,7 +20,7 @@ public class InstalledAppsFragment extends AppListFragment {
@Override
protected String getFromTitle() {
return getString(R.string.tab_installed_apps);
return getString(R.string.installed_title);
}
@Override