From 5c9a2d260d777cc334e5ab424d39a7411273c04f Mon Sep 17 00:00:00 2001
From: daniel oeh <daniel.oeh@gmail.com>
Date: Sat, 7 Jul 2012 23:37:52 +0200
Subject: [PATCH] Added strings for preferences

---
 res/xml/preferences.xml           | 46 +++++++++++++++++++++++--------
 src/de/podfetcher/PodcastApp.java | 19 +++++++------
 2 files changed, 44 insertions(+), 21 deletions(-)

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 52eec8df4..e7953efc7 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
-    <PreferenceCategory android:title="@string/playback_pref">
-        <CheckBoxPreference android:key="prefPauseOnHeadsetDisconnect" android:title="@string/pref_pauseOnHeadsetDisconnect_title" android:enabled="true" android:defaultValue="true" android:summary="@string/pref_pauseOnHeadsetDisconnect_sum"/>
-        <CheckBoxPreference android:key="prefFollowQueue" android:title="@string/pref_followQueue_title" android:enabled="true" android:defaultValue="false" android:summary="@string/pref_followQueue_sum"/>
-    </PreferenceCategory><PreferenceCategory android:title="@string/network_pref">
-        <CheckBoxPreference android:key="prefDownloadMediaOnWifiOnly" android:title="@string/pref_downloadMediaOnWifiOnly_title" android:enabled="true" android:defaultValue="true" android:summary="@string/pref_downloadMediaOnWifiOnly_sum"/><ListPreference android:title="@string/pref_autoUpdateIntervall_title" android:summary="@string/pref_autoUpdateIntervall_sum" android:key="prefAutoUpdateIntervall" android:entryValues="@array/update_intervall_values" android:entries="@array/update_intervall_options" android:defaultValue="0"/>
-        
-    </PreferenceCategory><PreferenceCategory android:title="@string/other_pref">
-        <Preference android:title="@string/version_pref"/>
-        <Preference android:title="@string/about_pref"/>
+
+    <PreferenceCategory android:title="@string/playback_pref" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="prefPauseOnHeadsetDisconnect"
+            android:summary="@string/pref_pauseOnHeadsetDisconnect_sum"
+            android:title="@string/pref_pauseOnHeadsetDisconnect_title" />
+        <CheckBoxPreference
+            android:defaultValue="false"
+            android:enabled="true"
+            android:key="prefFollowQueue"
+            android:summary="@string/pref_followQueue_sum"
+            android:title="@string/pref_followQueue_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/network_pref" >
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:enabled="true"
+            android:key="prefDownloadMediaOnWifiOnly"
+            android:summary="@string/pref_downloadMediaOnWifiOnly_sum"
+            android:title="@string/pref_downloadMediaOnWifiOnly_title" />
+
+        <ListPreference
+            android:defaultValue="0"
+            android:entries="@array/update_intervall_options"
+            android:entryValues="@array/update_intervall_values"
+            android:key="prefAutoUpdateIntervall"
+            android:summary="@string/pref_autoUpdateIntervall_sum"
+            android:title="@string/pref_autoUpdateIntervall_title" />
+    </PreferenceCategory>
+    <PreferenceCategory android:title="@string/other_pref" >
+        <Preference android:title="@string/version_pref" />
+        <Preference android:title="@string/about_pref" />
     </PreferenceCategory>
-    
-    
-    
 
 </PreferenceScreen>
\ No newline at end of file
diff --git a/src/de/podfetcher/PodcastApp.java b/src/de/podfetcher/PodcastApp.java
index e4c2f0971..b58e7997d 100644
--- a/src/de/podfetcher/PodcastApp.java
+++ b/src/de/podfetcher/PodcastApp.java
@@ -6,12 +6,16 @@ import de.podfetcher.asynctask.FeedImageLoader;
 import de.podfetcher.feed.FeedManager;
 
 public class PodcastApp extends Application {
-    private static final String TAG = "PodcastApp";
-    public static final String PREF_NAME = "PodfetcherPrefs";
-    
-    
-	private static PodcastApp singleton;
+	private static final String TAG = "PodcastApp";
+	public static final String PREF_NAME = "PodfetcherPrefs";
+
+	public static final String PREF_PAUSE_ON_HEADSET_DISCONNECT = "prefPauseOnHeadsetDisconnect";
+	public static final String PREF_FOLLOW_QUEUE = "prefFollowQueue";
+	public static final String PREF_DOWNLOAD_MEDIA_ON_WIFI_ONLY = "prefDownloadMediaOnWifiOnly";
+	public static final String PREF_UPDATE_INTERVALL = "prefAutoUpdateIntervall";
 	
+	private static PodcastApp singleton;
+
 	public static PodcastApp getInstance() {
 		return singleton;
 	}
@@ -20,7 +24,7 @@ public class PodcastApp extends Application {
 	public void onCreate() {
 		super.onCreate();
 		singleton = this;
-		
+
 		FeedManager manager = FeedManager.getInstance();
 		manager.loadDBData(getApplicationContext());
 	}
@@ -31,8 +35,5 @@ public class PodcastApp extends Application {
 		Log.w(TAG, "Received onLowOnMemory warning. Cleaning image cache...");
 		FeedImageLoader.getInstance().wipeImageCache();
 	}
-	
-	
-	
 
 }