General improvement & continuation of development

1 files changed, 35 insertions, 3 deletions

diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java
index 8382683..505674a 100644
--- a/app/src/main/java/com/camilstaps/taize/MainActivity.java
+++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java
@@ -9,6 +9,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -17,8 +18,12 @@ import android.view.ViewGroup;
 import android.support.v4.widget.DrawerLayout;
 import android.widget.TextView;
 
+import com.camilstaps.common.Date;
+import com.camilstaps.common.Listener;
 import com.camilstaps.common.NullListener;
 
+import java.util.HashSet;
+
 
 public class MainActivity extends ActionBarActivity
         implements NavigationDrawerFragment.NavigationDrawerCallbacks {
@@ -52,7 +57,7 @@ public class MainActivity extends ActionBarActivity
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
                 switch (key) {
-                    case "dailyreading":
+                    case "dailyreadings":
                     case "dailyreadingbible":
                         setupContent();
                         break;
@@ -80,11 +85,38 @@ public class MainActivity extends ActionBarActivity
     }
 
     private void setDailyReading() {
-        ((TextView) findViewById(R.id.textDailyReading)).setText(PreferenceManager.getDefaultSharedPreferences(this).getString("dailyreading", "No daily reading found."));
+        Date date = new Date();
+
+        Taize.getDailyReading(this, new Listener<DailyReading>() {
+            @Override
+            public void success(DailyReading data) {
+                ((TextView) findViewById(R.id.textDailyReading)).setText(data.getTextWithoutReference());
+                BibleText bt = data.getBibleReference();
+                if (bt != null)
+                    ((TextView) findViewById(R.id.refDailyReadingBibleText)).setText(bt.toString());
+            }
+
+            @Override
+            public void failure() {
+                ((TextView) findViewById(R.id.textDailyReading)).setText("No reading found.");
+            }
+        }, date);
+
+        ((TextView) findViewById(R.id.dateDailyReading)).setText(date.toNiceString());
     }
 
     private void setDailyReadingBibleText() {
-        ((TextView) findViewById(R.id.textDailyReadingBibleText)).setText(PreferenceManager.getDefaultSharedPreferences(this).getString("dailyreadingbible", "Could not fetch bible text."));
+        Taize.getDailyReadingBibleText(this, new Listener<String>() {
+            @Override
+            public void success(String data) {
+                ((TextView) findViewById(R.id.textDailyReadingBibleText)).setText(data);
+            }
+
+            @Override
+            public void failure() {
+                ((TextView) findViewById(R.id.textDailyReadingBibleText)).setText("No bible text found.");
+            }
+        });
     }
 
     @Override