3 files changed, 21 insertions, 12 deletions

diff --git a/app/src/main/java/com/camilstaps/taize/Bible.java b/app/src/main/java/com/camilstaps/taize/Bible.java
index abb1890..0e90ccb 100644
--- a/app/src/main/java/com/camilstaps/taize/Bible.java
+++ b/app/src/main/java/com/camilstaps/taize/Bible.java
@@ -50,7 +50,7 @@ public class Bible {
      * @return the version from the preferences
      */
     public static String getVersion(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getString(SettingsActivity.SettingsFragment.PREF_VERSION_BIBLE, context.getResources().getString(R.string.pref_version_bible_default));
+        return PreferenceManager.getDefaultSharedPreferences(context).getString(SettingsActivity.GeneralSettingsFragment.PREF_VERSION_BIBLE, context.getResources().getString(R.string.pref_version_bible_default));
     }
 
     /**
diff --git a/app/src/main/java/com/camilstaps/taize/SettingsActivity.java b/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
index 3dd2881..fac5b45 100644
--- a/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
+++ b/app/src/main/java/com/camilstaps/taize/SettingsActivity.java
@@ -1,6 +1,5 @@
 package com.camilstaps.taize;
 
-
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.Bundle;
@@ -9,21 +8,24 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 import com.camilstaps.common.DatedStringPreferenceSet;
-import com.camilstaps.common.NullListener;
-
-import java.util.HashSet;
 
+/**
+ * Simple preferences activity for app settings
+ * @author Camil Staps
+ */
 public class SettingsActivity extends PreferenceActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit();
+        getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralSettingsFragment()).commit();
     }
 
+    /**
+     * OnPreferenceChangeListener to bind the summary of a preference to its value
+     */
     private static Preference.OnPreferenceChangeListener onPreferenceChangeListener = new Preference.OnPreferenceChangeListener() {
         @Override
         public boolean onPreferenceChange(Preference pref, Object newValue) {
@@ -41,12 +43,19 @@ public class SettingsActivity extends PreferenceActivity {
         }
     };
 
+    /**
+     * Bind the summary of a prefernce to its value
+     * @param pref
+     */
     private static void bindSummaryToValue(Preference pref) {
         pref.setOnPreferenceChangeListener(onPreferenceChangeListener);
         onPreferenceChangeListener.onPreferenceChange(pref, PreferenceManager.getDefaultSharedPreferences(pref.getContext()).getString(pref.getKey(), pref.getSummary().toString()));
     }
 
-    public static class SettingsFragment extends PreferenceFragment {
+    /**
+     * The general settings fragment
+     */
+    public static class GeneralSettingsFragment extends PreferenceFragment {
         public static final String PREF_LANGUAGE_READINGS = "pref_language_reading";
         public static final String PREF_VERSION_BIBLE = "pref_version_bible";
 
@@ -67,9 +76,9 @@ public class SettingsActivity extends PreferenceActivity {
             sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
                 @Override
                 public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
-                    if (key.equals(SettingsFragment.PREF_LANGUAGE_READINGS)) {
+                    if (key.equals(GeneralSettingsFragment.PREF_LANGUAGE_READINGS)) {
                         DatedStringPreferenceSet.clear(context, "dailyreadings");
-                    } else if (key.equals(SettingsFragment.PREF_VERSION_BIBLE)) {
+                    } else if (key.equals(GeneralSettingsFragment.PREF_VERSION_BIBLE)) {
                         DatedStringPreferenceSet.clear(context, "dailyreadingbibletexts");
                     }
                 }
diff --git a/app/src/main/java/com/camilstaps/taize/Taize.java b/app/src/main/java/com/camilstaps/taize/Taize.java
index 25b8e3e..9ab91af 100644
--- a/app/src/main/java/com/camilstaps/taize/Taize.java
+++ b/app/src/main/java/com/camilstaps/taize/Taize.java
@@ -180,7 +180,7 @@ public class Taize {
 
         try {
             retrieve.execute(url_reading_feed
-                    + "?lang=" + PreferenceManager.getDefaultSharedPreferences(context).getString(SettingsActivity.SettingsFragment.PREF_LANGUAGE_READINGS, "en")
+                    + "?lang=" + PreferenceManager.getDefaultSharedPreferences(context).getString(SettingsActivity.GeneralSettingsFragment.PREF_LANGUAGE_READINGS, "en")
                     + "&date=" + date.toString()
             ).get();
         } catch (Exception e) {
@@ -233,7 +233,7 @@ public class Taize {
         try {
             retrieve.execute(url_meditation_feed
                     + "?lang=" + PreferenceManager.getDefaultSharedPreferences(context).getString(
-                            SettingsActivity.SettingsFragment.PREF_LANGUAGE_READINGS,
+                            SettingsActivity.GeneralSettingsFragment.PREF_LANGUAGE_READINGS,
                             context.getString(R.string.pref_language_dailyreading_default))
                     + "&date=" + date.toString()
             ).get();