aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Knepper <thknepper@gmx.de>2014-04-09 11:17:53 +0200
committerThomas Knepper <thknepper@gmx.de>2014-04-09 11:17:53 +0200
commit1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884 (patch)
tree37e51646828d6e4acad3fccdcd911e5e02606be6
parent035d49df7ee3c9947e48f5c552618fd67d4bd990 (diff)
downloaddsub-1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884.tar.gz
dsub-1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884.tar.bz2
dsub-1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884.zip
Revert "Use resource string instead of hard code"
This reverts commit 8d31d2edebd352b12693914516351399ae3f965d.
-rw-r--r--res/values-de/strings.xml2
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/github/daneren2005/dsub/fragments/DownloadFragment.java4
3 files changed, 2 insertions, 6 deletions
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ce60bb59..3d324cbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -198,8 +198,6 @@
<string name="download.downloading_summary_expanded">Aktuell: %1$s
\nGeschätzte Größe: %2$s</string>
<string name="download.failed_to_load">Laden fehlgeschlagen</string>
- <string name="download.title_now_playing">Aktuelles Lied</string>
- <string name="download.title_downloading">Aktive Downloads</string>
<string name="sync.title">DSub: Neue Medien verfügbar</string>
<string name="sync.new_podcasts">Neuer Podcast: %s</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7f5c2f6..87c7c8e0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -198,8 +198,6 @@
<string name="download.downloading_summary_expanded">Current: %1$s
\nEstimated Size: %2$s</string>
<string name="download.failed_to_load">Failed to load</string>
- <string name="download.title_now_playing">Now Playing</string>
- <string name="download.title_downloading">Downloading</string>
<string name="sync.title">DSub: New media is available</string>
<string name="sync.new_podcasts">New podcasts: %s</string>
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index ec75af80..bc30eb02 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -146,7 +146,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
rootView = inflater.inflate(R.layout.download, container, false);
- setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
+ setTitle(nowPlaying ? "Now Playing" : "Downloading");
mainLayout = rootView.findViewById(R.id.download_layout);
if(!primaryFragment) {
@@ -1403,7 +1403,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
private void toggleNowPlaying() {
nowPlaying = !nowPlaying;
- setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
+ setTitle(nowPlaying ? "Now Playing" : "Downloading");
onDownloadListChanged(true);
}