diff options
Diffstat (limited to 'app/src/main/java')
| -rw-r--r-- | app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java | 4 | ||||
| -rw-r--r-- | app/src/main/java/com/camilstaps/taize/MainActivity.java | 103 |
2 files changed, 27 insertions, 80 deletions
diff --git a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java index cc774f7..8fc5258 100644 --- a/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java +++ b/app/src/main/java/com/camilstaps/taize/DailyReadingFragment.java @@ -79,7 +79,9 @@ public class DailyReadingFragment extends Fragment { } }, date); - ((TextView) rootView.findViewById(R.id.dateDailyReading)).setText(date.toNiceString(getActivity())); + String niceDate = date.toNiceString(getActivity()); + niceDate = niceDate.substring(0,1).toUpperCase() + niceDate.substring(1); + ((TextView) rootView.findViewById(R.id.dateDailyReading)).setText(niceDate); } private void setDailyReadingBibleText() { diff --git a/app/src/main/java/com/camilstaps/taize/MainActivity.java b/app/src/main/java/com/camilstaps/taize/MainActivity.java index e9157ef..7b6f4f2 100644 --- a/app/src/main/java/com/camilstaps/taize/MainActivity.java +++ b/app/src/main/java/com/camilstaps/taize/MainActivity.java @@ -1,28 +1,20 @@ package com.camilstaps.taize; import android.content.Intent; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentStatePagerAdapter; +import android.support.v4.app.FragmentTransaction; import android.support.v4.view.ViewPager; +import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; import android.os.Bundle; -import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import android.widget.TextView; - -import com.camilstaps.common.Date; -import com.camilstaps.common.Listener; public class MainActivity extends ActionBarActivity { - private SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener; - ViewPager pager; PagerAdapter pagerAdapter; @@ -32,40 +24,34 @@ public class MainActivity extends ActionBarActivity { setContentView(R.layout.activity_main); - setupContent(); + pager = (ViewPager) findViewById(R.id.pager); + pagerAdapter = new PagerAdapter(getSupportFragmentManager()); + pager.setAdapter(pagerAdapter); + + final ActionBar actionBar = getSupportActionBar(); + actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS); + //actionBar.setDisplayShowTitleEnabled(true); - sharedPreferenceChangeListener = new SharedPreferences.OnSharedPreferenceChangeListener() { + ActionBar.TabListener tabListener = new ActionBar.TabListener() { @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { - switch (key) { - case "dailyreadings": - case "dailyreadingbible": - setupContent(); - break; - } + public void onTabSelected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { + } - }; - PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener); - /*Intent intent = new Intent(this, CollectionDemoActivity.class); - startActivity(intent);*/ + @Override + public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { - pager = (ViewPager) findViewById(R.id.pager); - pagerAdapter = new PagerAdapter(getSupportFragmentManager()); - pager.setAdapter(pagerAdapter); + } - } + @Override + public void onTabReselected(ActionBar.Tab tab, FragmentTransaction fragmentTransaction) { - @Override - public void onRestoreInstanceState(Bundle savedInstanceState) { - super.onRestoreInstanceState(savedInstanceState); - setupContent(); - } + } + }; - @Override - public void onResume() { - super.onResume(); - setupContent(); + actionBar.addTab(actionBar.newTab().setText("Reading").setIcon(R.drawable.ic_action_book).setTabListener(tabListener)); + actionBar.addTab(actionBar.newTab().setText("Meditation").setIcon(R.drawable.ic_action_meditation).setTabListener(tabListener)); + actionBar.addTab(actionBar.newTab().setText("Podcast").setIcon(R.drawable.ic_action_podcast).setTabListener(tabListener)); } public void onBackPressed() { @@ -76,53 +62,12 @@ public class MainActivity extends ActionBarActivity { } } - protected void setupContent() { - setDailyReading(); - setDailyReadingBibleText(); - - Log.d("MAIN", "Setting up content"); - } - - private void setDailyReading() { -// 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(this)); - } - - private void setDailyReadingBibleText() { -// 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 public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = getMenuInflater(); inflater.inflate(R.menu.global, menu); - return super.onCreateOptionsMenu(menu); + return true; + //return super.onCreateOptionsMenu(menu); } @Override |