diff options
author | Andrew Dolgov <[email protected]> | 2013-02-14 13:03:39 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2013-02-14 13:03:39 +0400 |
commit | baf1bea9326c7b4ad1f239f502907a47f11a41cf (patch) | |
tree | d50a6511d0736870c24c01fcc57aa99db46f0da3 | |
parent | be9c8d661439f3eb95073eb157d10368e5ad49ea (diff) |
articlepager: fix context being lost after activity resume in offline
mode (closes #533)
bump version
-rw-r--r-- | AndroidManifest.xml | 4 | ||||
-rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 5 | ||||
-rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticlePager.java | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9eed659d..1952806c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="136" - android:versionName="1.14" > + android:versionCode="137" + android:versionName="1.15" > <uses-sdk android:minSdkVersion="8" diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index bc378b40..5a2803ff 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -188,14 +188,15 @@ public class OfflineArticleFragment extends Fragment implements GestureDetector. web.setLayerType(View.LAYER_TYPE_SOFTWARE, null);
}
- if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
+ if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK")) {
cssOverride = "body { background : transparent; color : #e0e0e0}";
} else if (m_prefs.getString("theme", "THEME_DARK").equals("THEME_DARK_GRAY")) {
cssOverride = "body { background : transparent; color : #e0e0e0}";
} else {
cssOverride = "body { background : transparent; }";
}
-
+ web.setBackgroundColor(getResources().getColor(android.R.color.transparent));
+
String hexColor = String.format("#%06X", (0xFFFFFF & tv.data));
cssOverride += " a:link {color: "+hexColor+";} a:visited { color: "+hexColor+";}";
diff --git a/src/org/fox/ttrss/offline/OfflineArticlePager.java b/src/org/fox/ttrss/offline/OfflineArticlePager.java index 8de609c2..f4c22138 100644 --- a/src/org/fox/ttrss/offline/OfflineArticlePager.java +++ b/src/org/fox/ttrss/offline/OfflineArticlePager.java @@ -137,6 +137,10 @@ public class OfflineArticlePager extends Fragment { m_isCat = savedInstanceState.getBoolean("isCat", false);
}
+ Log.d(TAG, "feed=" + m_feedId + "; iscat=" + m_isCat);
+
+ m_cursor = createCursor();
+
m_adapter = new PagerAdapter(getActivity().getSupportFragmentManager());
int position = 0;
@@ -202,8 +206,6 @@ public class OfflineArticlePager extends Fragment { m_listener = (OfflineHeadlinesEventListener)activity;
m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext());
-
- m_cursor = createCursor();
}
|