General continuation of development

1 files changed, 26 insertions, 7 deletions

diff --git a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java
index b5cde3c..e3b93e8 100644
--- a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java
+++ b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java
@@ -5,14 +5,17 @@ import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.camilstaps.common.Date;
 import com.camilstaps.common.Listener;
+import com.camilstaps.common.NullListener;
 
 /**
  * Created by camilstaps on 8-4-15.
@@ -24,6 +27,8 @@ public class DailyReadingFragment extends Fragment {
     private Context context;
 
     private Date date;
+    private String reading;
+    private String bibleText;
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
@@ -37,7 +42,7 @@ public class DailyReadingFragment extends Fragment {
         int dateOffset = args.getInt("dateOffset", 0);
 
         date = new Date();
-        date.subtractDays(dateOffset);
+        date.addOrSubtractDays(dateOffset);
 
         setupContent();
 
@@ -62,24 +67,36 @@ public class DailyReadingFragment extends Fragment {
         PreferenceManager.getDefaultSharedPreferences(context).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
     }
 
+    public String getReading() {
+        return reading;
+    }
+
+    public String getBibleText() {
+        return bibleText;
+    }
+
     protected void setupContent() {
-        setDailyReading();
-        setDailyReadingBibleText();
+        setDailyReading(new NullListener<DailyReading>());
+        setDailyReadingBibleText(new NullListener<String>());
     }
 
-    private void setDailyReading() {
+    public void setDailyReading(final Listener<DailyReading> listener) {
         Taize.getDailyReading(context, new Listener<DailyReading>() {
             @Override
             public void success(DailyReading data) {
                 ((TextView) rootView.findViewById(R.id.textDailyReading)).setText(data.getTextWithoutReference());
+                reading = data.getString();
                 BibleText bt = data.getBibleReference();
-                if (bt != null)
+                if (bt != null) {
                     ((TextView) rootView.findViewById(R.id.refDailyReadingBibleText)).setText(bt.toString());
+                }
+                listener.success(data);
             }
 
             @Override
             public void failure() {
                 ((TextView) rootView.findViewById(R.id.textDailyReading)).setText("No reading found.");
+                listener.failure();
             }
         }, date);
 
@@ -88,18 +105,20 @@ public class DailyReadingFragment extends Fragment {
         ((TextView) rootView.findViewById(R.id.dateDailyReading)).setText(niceDate);
     }
 
-    private void setDailyReadingBibleText() {
+    public void setDailyReadingBibleText(final Listener<String> listener) {
         Taize.getDailyReadingBibleText(context, new Listener<String>() {
             @Override
             public void success(String data) {
                 ((TextView) rootView.findViewById(R.id.textDailyReadingBibleText)).setText(data);
+                bibleText = data;
+                listener.success(data);
             }
 
             @Override
             public void failure() {
                 ((TextView) rootView.findViewById(R.id.textDailyReadingBibleText)).setText("No bible text found.");
+                listener.failure();
             }
         }, date);
     }
-
 }