From 16bc77419f16d95c1903da7227e809ae27e6d4c1 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 25 Nov 2011 14:03:14 +0300 Subject: refresh feeds when article is closed fixes for dark theme --- src/org/fox/ttrss/ArticleFragment.java | 16 +++++++++++++--- src/org/fox/ttrss/HeadlinesFragment.java | 8 +++++--- src/org/fox/ttrss/MainActivity.java | 1 + 3 files changed, 19 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index 86bb4e8c..a0f9710e 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -9,6 +9,7 @@ import android.app.Activity; import android.app.Fragment; import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.text.Html; import android.text.method.LinkMovementMethod; import android.view.LayoutInflater; @@ -20,8 +21,7 @@ import android.widget.TextView; public class ArticleFragment extends Fragment { private final String TAG = this.getClass().getSimpleName(); - protected SharedPreferences m_prefs; - + private SharedPreferences m_prefs; private Article m_article; @Override @@ -50,10 +50,19 @@ public class ArticleFragment extends Fragment { // TODO white on black style for dark theme String content; try { + String backgroundOverride = ""; + + if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) { + backgroundOverride = "body { background : black; color : #f0f0f0}\n"; + } + content = URLEncoder.encode("" + "" + "" + // wtf, google? - "" + + "" + "" + "" + m_article.content + "", "utf-8").replace('+', ' '); } catch (UnsupportedEncodingException e) { @@ -99,6 +108,7 @@ public class ArticleFragment extends Fragment { public void onAttach(Activity activity) { super.onAttach(activity); + m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); m_article = ((MainActivity)activity).getSelectedArticle(); } } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index 611941cb..837996ef 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -42,13 +42,15 @@ import com.google.gson.reflect.TypeToken; public class HeadlinesFragment extends Fragment implements OnItemClickListener { private final String TAG = this.getClass().getSimpleName(); - protected SharedPreferences m_prefs; + private SharedPreferences m_prefs; private Feed m_feed; private int m_selectedArticleId; private ArticleListAdapter m_adapter; private ArticleList m_articles = new ArticleList(); + private ArticleList m_selectedArticles = new ArticleList(); + private OnArticleSelectedListener m_articleSelectedListener; public interface OnArticleSelectedListener { @@ -87,6 +89,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener { m_feed = savedInstanceState.getParcelable("feed"); m_articles = savedInstanceState.getParcelable("articles"); m_selectedArticleId = savedInstanceState.getInt("selectedArticleId"); + m_selectedArticles = savedInstanceState.getParcelable("selectedArticles"); } View view = inflater.inflate(R.layout.headlines_fragment, container, false); @@ -170,6 +173,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener { out.putParcelable("feed", m_feed); out.putParcelable("articles", m_articles); out.putInt("selectedArticleId", m_selectedArticleId); + out.putParcelable("selectedArticles", m_selectedArticles); } private class HeadlinesRequest extends ApiRequest { @@ -266,8 +270,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener { public static final int VIEW_COUNT = VIEW_SELECTED+1; - private ArrayList

m_selectedArticles = new ArrayList

(); - public ArticleListAdapter(Context context, int textViewResourceId, ArrayList

items) { super(context, textViewResourceId, items); this.items = items; diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 56760642..d9501c4f 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -252,6 +252,7 @@ public class MainActivity extends Activity implements FeedsFragment.OnFeedSelect findViewById(R.id.feeds_fragment).setVisibility(View.VISIBLE); initMainMenu(); + refreshFeeds(); m_selectedArticle = null; } -- cgit v1.2.3-54-g00ecf