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

Add strings for first time installs

Browse Source
This commit is contained in:
mvp76 2017-02-28 17:15:42 +01:00
parent 04d2d004a3
commit a4c187f3e1
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
View File

@ -273,7 +273,7 @@ class NotificationHelper {
case Downloading:
return app.name;
case ReadyToInstall:
return context.getString(R.string.notification_title_single_ready_to_install_update);
return context.getString(app.isInstalled() ? R.string.notification_title_single_ready_to_install_update : R.string.notification_title_single_ready_to_install);
case Installing:
return app.name;
case Installed:
@ -289,7 +289,7 @@ class NotificationHelper {
case UpdateAvailable:
return app.name;
case Downloading:
return context.getString(R.string.notification_content_single_downloading_update, app.name);
return context.getString(app.isInstalled() ? R.string.notification_content_single_downloading_update : R.string.notification_content_single_downloading, app.name);
case ReadyToInstall:
return app.name;
case Installing:
@ -302,14 +302,14 @@ class NotificationHelper {
return "";
}
private String getMultiItemContentString(AppUpdateStatusManager.Status status) {
private String getMultiItemContentString(App app, AppUpdateStatusManager.Status status) {
switch (status) {
case UpdateAvailable:
return context.getString(R.string.notification_title_summary_update_available);
case Downloading:
return context.getString(R.string.notification_title_summary_downloading_update);
return context.getString(app.isInstalled() ? R.string.notification_title_summary_downloading_update : R.string.notification_title_summary_downloading);
case ReadyToInstall:
return context.getString(R.string.notification_title_summary_ready_to_install_update);
return context.getString(app.isInstalled() ? R.string.notification_title_summary_ready_to_install_update : R.string.notification_title_summary_ready_to_install);
case Installing:
return context.getString(R.string.notification_title_summary_installing);
case Installed:
@ -383,7 +383,7 @@ class NotificationHelper {
App app = entry.app;
AppUpdateStatusManager.Status status = entry.status;
String content = getMultiItemContentString(status);
String content = getMultiItemContentString(app, status);
SpannableStringBuilder sb = new SpannableStringBuilder(app.name);
sb.setSpan(new StyleSpan(Typeface.BOLD), 0, sb.length(), Spanned.SPAN_INCLUSIVE_EXCLUSIVE);
sb.append(" ");

4
app/src/main/res/values/strings.xml
View File

@ -401,8 +401,10 @@
<!-- notifications -->
<string name="notification_summary_more">+%1$d more…</string>
<string name="notification_title_single_update_available">Update Available</string>
<string name="notification_title_single_ready_to_install">Ready to install</string>
<string name="notification_title_single_ready_to_install_update">Update ready to install</string>
<string name="notification_title_single_install_error">Install Failed</string>
<string name="notification_content_single_downloading">Downloading \"%1$s\"&#8230;</string>
<string name="notification_content_single_downloading_update">Downloading update for \"%1$s\"&#8230;</string>
<string name="notification_content_single_installing">Installing \"%1$s\"&#8230;</string>
<string name="notification_content_single_installed">Successfully installed</string>
@ -410,7 +412,9 @@
<string name="notification_summary_updates">%1$d Updates</string>
<string name="notification_summary_installed">%1$d Apps Installed</string>
<string name="notification_title_summary_update_available">Update available</string>
<string name="notification_title_summary_downloading">Downloading&#8230;</string>
<string name="notification_title_summary_downloading_update">Downloading update&#8230;</string>
<string name="notification_title_summary_ready_to_install">Ready to install</string>
<string name="notification_title_summary_ready_to_install_update">Update ready to install</string>
<string name="notification_title_summary_installing">Installing</string>
<string name="notification_title_summary_installed">Successfully installed</string>